summaryrefslogtreecommitdiffstats
path: root/chrome/utility
diff options
context:
space:
mode:
authorrdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-27 20:55:50 +0000
committerrdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-27 20:55:50 +0000
commit702d8b462fceaf9613a42e66c5464abfcf3e2550 (patch)
treef12c4f8d8eb715a80b273d252085aa93308c70e6 /chrome/utility
parentf19144dba4ac3b6ecf36dc1debefbcefe10ac5bb (diff)
downloadchromium_src-702d8b462fceaf9613a42e66c5464abfcf3e2550.zip
chromium_src-702d8b462fceaf9613a42e66c5464abfcf3e2550.tar.gz
chromium_src-702d8b462fceaf9613a42e66c5464abfcf3e2550.tar.bz2
Move Icons out of Extension class
BUG=159265 TBR=davemoore@chromium.org, atwilson@chromium.org, dalecurtis@chromium.org (davemoore - c/b/chromeos, atwilson - c/b/background, dalecurtis - c/b/media) Review URL: https://chromiumcodereview.appspot.com/11786003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/utility')
-rw-r--r--chrome/utility/chrome_content_utility_client.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc
index 2eac856..d2287b7 100644
--- a/chrome/utility/chrome_content_utility_client.cc
+++ b/chrome/utility/chrome_content_utility_client.cc
@@ -20,6 +20,7 @@
#include "chrome/common/extensions/api/extension_action/browser_action_handler.h"
#include "chrome/common/extensions/api/extension_action/page_action_handler.h"
#include "chrome/common/extensions/api/i18n/default_locale_handler.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
#include "chrome/common/extensions/api/themes/theme_handler.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_l10n_util.h"
@@ -60,6 +61,9 @@ void RegisterExtensionManifestHandlers() {
extensions::ManifestHandler::Register(
extension_manifest_keys::kDefaultLocale,
make_linked_ptr(new extensions::DefaultLocaleHandler));
+ extensions::ManifestHandler::Register(
+ extension_manifest_keys::kIcons,
+ make_linked_ptr(new extensions::IconsHandler));
linked_ptr<extensions::PageActionHandler> page_action_handler(
new extensions::PageActionHandler);
extensions::ManifestHandler::Register(