Remove AppDelegate::GetAppDefaultIcon

The default app icon resource exists in the //extensions module resources
file and all implementations return the same icon. There's no need to delegate
this out.

BUG=none
TEST=app_shell, athena_main and chrome all run in debug without assertions
about missing resources

Review URL: https://codereview.chromium.org/586853004

Cr-Commit-Position: refs/heads/master@{#295916}

athena/extensions/athena_app_delegate_base.cc

@@ -88,11 +88,6 @@ int AthenaAppDelegateBase::PreferredIconSize() {
   return extension_misc::EXTENSION_ICON_SMALL;
 }
 
-gfx::ImageSkia AthenaAppDelegateBase::GetAppDefaultIcon() {
-  return *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-      IDR_APP_DEFAULT_ICON);
-}
-
 bool AthenaAppDelegateBase::IsWebContentsVisible(
     content::WebContents* web_contents) {
   return web_contents->GetNativeView()->IsVisible();

athena/extensions/athena_app_delegate_base.h

@@ -33,7 +33,6 @@ class AthenaAppDelegateBase : public extensions::AppDelegate {
                               bool user_gesture,
                               bool* was_blocked) OVERRIDE;
   virtual int PreferredIconSize() OVERRIDE;
-  virtual gfx::ImageSkia GetAppDefaultIcon() OVERRIDE;
   virtual bool IsWebContentsVisible(
       content::WebContents* web_contents) OVERRIDE;
   virtual void SetTerminatingCallback(const base::Closure& callback) OVERRIDE;

athena/resources/athena_resources.gyp

@@ -49,7 +49,6 @@
             '<(SHARED_INTERMEDIATE_DIR)/components/component_resources.pak',
             '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_strings_en-US.pak',
             '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak',
-            '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_browser_resources_100_percent.pak',
             '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak',
             '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/strings/ui_chromeos_strings_en-US.pak',
           ],

chrome/browser/ui/apps/chrome_app_delegate.cc

@@ -29,8 +29,6 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "extensions/common/constants.h"
-#include "extensions/grit/extensions_browser_resources.h"
-#include "ui/base/resource/resource_bundle.h"
 
 #if defined(USE_ASH)
 #include "ash/shelf/shelf_constants.h"
@@ -263,11 +261,6 @@ int ChromeAppDelegate::PreferredIconSize() {
 #endif
 }
 
-gfx::ImageSkia ChromeAppDelegate::GetAppDefaultIcon() {
-  return *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-      IDR_APP_DEFAULT_ICON);
-}
-
 void ChromeAppDelegate::SetWebContentsBlocked(
     content::WebContents* web_contents,
     bool blocked) {

chrome/browser/ui/apps/chrome_app_delegate.h

@@ -60,7 +60,6 @@ class ChromeAppDelegate : public extensions::AppDelegate,
       content::MediaStreamType type,
       const extensions::Extension* extension) OVERRIDE;
   virtual int PreferredIconSize() OVERRIDE;
-  virtual gfx::ImageSkia GetAppDefaultIcon() OVERRIDE;
   virtual void SetWebContentsBlocked(content::WebContents* web_contents,
                                      bool blocked) OVERRIDE;
   virtual bool IsWebContentsVisible(

extensions/browser/app_window/app_delegate.h

@@ -9,7 +9,6 @@
 #include "content/public/common/media_stream_request.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/window_open_disposition.h"
-#include "ui/gfx/image/image_skia.h"
 
 namespace content {
 class BrowserContext;
@@ -21,6 +20,7 @@ class WebContents;
 
 namespace gfx {
 class Rect;
+class Size;
 }
 
 namespace extensions {
@@ -69,10 +69,6 @@ class AppDelegate {
                                           const Extension* extension) = 0;
   virtual int PreferredIconSize() = 0;
 
-  // TODO(jamescook): Eliminate this method. All implementations load the same
-  // icon, and the icon is available in the extensions module resources.
-  virtual gfx::ImageSkia GetAppDefaultIcon() = 0;
-
   // Web contents modal dialog support.
   virtual void SetWebContentsBlocked(content::WebContents* web_contents,
                                      bool blocked) = 0;

extensions/browser/app_window/app_window.cc

@@ -39,7 +39,9 @@
 #include "extensions/common/manifest_handlers/icons_handler.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/switches.h"
+#include "extensions/grit/extensions_browser_resources.h"
 #include "third_party/skia/include/core/SkRegion.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/screen.h"
 
 #if !defined(OS_MACOSX)
@@ -799,11 +801,15 @@ void AppWindow::UpdateExtensionAppIcon() {
   if (!extension)
     return;
 
+  gfx::ImageSkia app_default_icon =
+      *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+          IDR_APP_DEFAULT_ICON);
+
   app_icon_image_.reset(new IconImage(browser_context(),
                                       extension,
                                       IconsInfo::GetIcons(extension),
                                       app_delegate_->PreferredIconSize(),
-                                      app_delegate_->GetAppDefaultIcon(),
+                                      app_default_icon,
                                       this));
 
   // Triggers actual image loading with 1x resources. The 2x resource will

extensions/extensions.gyp

@@ -997,6 +997,7 @@
               '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_browser_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_renderer_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_resources.pak',

extensions/shell/browser/shell_app_delegate.cc

@@ -75,11 +75,6 @@ int ShellAppDelegate::PreferredIconSize() {
   return extension_misc::EXTENSION_ICON_SMALL;
 }
 
-gfx::ImageSkia ShellAppDelegate::GetAppDefaultIcon() {
-  NOTIMPLEMENTED();
-  return gfx::ImageSkia();
-}
-
 void ShellAppDelegate::SetWebContentsBlocked(
     content::WebContents* web_contents,
     bool blocked) {

extensions/shell/browser/shell_app_delegate.h

@@ -45,7 +45,6 @@ class ShellAppDelegate : public AppDelegate {
                                           content::MediaStreamType type,
                                           const Extension* extension) OVERRIDE;
   virtual int PreferredIconSize() OVERRIDE;
-  virtual gfx::ImageSkia GetAppDefaultIcon() OVERRIDE;
   virtual void SetWebContentsBlocked(content::WebContents* web_contents,
                                      bool blocked) OVERRIDE;
   virtual bool IsWebContentsVisible(