summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profiles
diff options
context:
space:
mode:
authorjstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-02 19:15:21 +0000
committerjstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-02 19:15:21 +0000
commitf83773f72845ed180a23dcbbfa9afbc3c295f758 (patch)
treeb5b6e561a0367be32f1785609ea97ab9e648e857 /chrome/browser/profiles
parentd1ca70cfc72762d6ff489f2558e6eb1333cbabf2 (diff)
downloadchromium_src-f83773f72845ed180a23dcbbfa9afbc3c295f758.zip
chromium_src-f83773f72845ed180a23dcbbfa9afbc3c295f758.tar.gz
chromium_src-f83773f72845ed180a23dcbbfa9afbc3c295f758.tar.bz2
Display disabled apps with grayed out images on the NTP. Call the re-enable logic when the user tries to launch the app. This also adds a chrome://extension-icon endpoint that provides easy access to extension and app icons.
BUG=61270 TEST=ExtensionIconSourceTest.IconsLoaded Review URL: http://codereview.chromium.org/6495002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76579 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles')
-rw-r--r--chrome/browser/profiles/profile_impl.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 4f5ee79..22e3911 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -71,6 +71,7 @@
#include "chrome/browser/transport_security_persister.h"
#include "chrome/browser/ui/find_bar/find_bar_state.h"
#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/extension_icon_source.h"
#include "chrome/browser/ui/webui/ntp_resource_cache.h"
#include "chrome/browser/user_style_sheet_watcher.h"
#include "chrome/browser/visitedlink/visitedlink_event_listener.h"
@@ -386,6 +387,10 @@ void ProfileImpl::InitExtensions() {
FilePath path = command_line->GetSwitchValuePath(switches::kLoadExtension);
extensions_service_->LoadExtension(path);
}
+
+ // Make the chrome://extension-icon/ resource is available.
+ ExtensionIconSource* icon_source = new ExtensionIconSource(this);
+ GetChromeURLDataManager()->AddDataSource(icon_source);
}
void ProfileImpl::RegisterComponentExtensions() {