Break src/extensions dependency on Chrome's theme_resources.h / .pak

* Move GetDefaultAppIcon and GetDefaultExtensionIcon out of src/extensions
  into chrome/browser.
* Inline one call to GetDefaultAppIcon in src/apps

This requires a DEPS exception in src/apps for grit/theme_resources.h, but
that's better than having one in src/extensions (as src/apps is much higher
in the dependency tree).

No functional changes.

BUG=368334
TEST=Clean build of extensions_unittests succeeds, Chrome about:extensions still displays default icon for extension with no icon.
TBR=msw@chromium.org for mechanical namespace/include changes in chrome/browser/ui/views/

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267142 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 0 insertions, 27 deletions

diff --git a/extensions/DEPS b/extensions/DEPS
index 00641a3..5d3a4d5 100644
--- a/extensions/DEPS
+++ b/extensions/DEPS
@@ -16,7 +16,6 @@ include_rules = [
   "!chrome/renderer/extensions/extension_helper.h",
   "!grit/common_resources.h",
   "!grit/extensions_api_resources.h",
-  "!grit/theme_resources.h",
 ]
 
 specific_include_rules = {
diff --git a/extensions/common/manifest_handlers/icons_handler.cc b/extensions/common/manifest_handlers/icons_handler.cc
index ebc18be..518ff406 100644
--- a/extensions/common/manifest_handlers/icons_handler.cc
+++ b/extensions/common/manifest_handlers/icons_handler.cc
@@ -16,8 +16,6 @@
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handler_helpers.h"
 #include "grit/extensions_strings.h"
-#include "grit/theme_resources.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/size.h"
 
 namespace extensions {
@@ -35,18 +33,6 @@ const ExtensionIconSet& IconsInfo::GetIcons(const Extension* extension) {
 }
 
 // static
-const gfx::ImageSkia& IconsInfo::GetDefaultAppIcon() {
-  return *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-      IDR_APP_DEFAULT_ICON);
-}
-
-// static
-const gfx::ImageSkia& IconsInfo::GetDefaultExtensionIcon() {
-  return *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-      IDR_EXTENSION_DEFAULT_ICON);
-}
-
-// static
 ExtensionResource IconsInfo::GetIconResource(
     const Extension* extension,
     int size,
diff --git a/extensions/common/manifest_handlers/icons_handler.h b/extensions/common/manifest_handlers/icons_handler.h
index 10a774f..3b8794d 100644
--- a/extensions/common/manifest_handlers/icons_handler.h
+++ b/extensions/common/manifest_handlers/icons_handler.h
@@ -14,10 +14,6 @@
 
 class GURL;
 
-namespace gfx {
-class ImageSkia;
-}
-
 namespace extensions {
 
 struct IconsInfo : public Extension::ManifestData {
@@ -27,11 +23,6 @@ struct IconsInfo : public Extension::ManifestData {
   // Return the icon set for the given |extension|.
   static const ExtensionIconSet& GetIcons(const Extension* extension);
 
-  // Returns the default extension/app icon (for extensions or apps that don't
-  // have one).
-  static const gfx::ImageSkia& GetDefaultExtensionIcon();
-  static const gfx::ImageSkia& GetDefaultAppIcon();
-
   // Get an extension icon as a resource or URL.
   static ExtensionResource GetIconResource(
       const Extension* extension,
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index 43cf863..255a68f 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -15,9 +15,6 @@
         # api resources compiled into the chrome resource bundle.
         # http://crbug.com/162530
         '../chrome/chrome_resources.gyp:chrome_resources',
-        # Need default icons in theme_resources.grd
-        '../chrome/chrome_resources.gyp:theme_resources',
-
         # TODO(tfarina): This dep here is for extensions/common/constants.*
         # We should find a way to compile this module within extensions_common.
         '../chrome/common_constants.gyp:common_constants',