Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(176)

Unified Diff: chrome/browser/extensions/extension_service.cc

Issue 10916305: Move shared file type images into chrome://theme/ scheme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix android build Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/icon_loader_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 6613da2d84bb8ba8303cffc5cb6b7777e86fdbad..8cbd725bc7973fcbe1943ea74b01554f131d655d 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -83,6 +83,7 @@
#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
#include "chrome/browser/ui/webui/favicon_source.h"
#include "chrome/browser/ui/webui/ntp/thumbnail_source.h"
+#include "chrome/browser/ui/webui/theme_source.h"
#include "chrome/common/child_process_logging.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_paths.h"
@@ -1019,6 +1020,15 @@ void ExtensionService::NotifyExtensionLoaded(const Extension* extension) {
FaviconSource::FAVICON);
ChromeURLDataManager::AddDataSource(profile_, favicon_source);
}
+
+#if !defined(OS_ANDROID)
+ // Same for chrome://theme/ resources.
+ if (extension->HasHostPermission(GURL(chrome::kChromeUIThemeURL))) {
+ ThemeSource* theme_source = new ThemeSource(profile_);
+ ChromeURLDataManager::AddDataSource(profile_, theme_source);
+ }
+#endif
+
// Same for chrome://thumb/ resources.
if (extension->HasHostPermission(GURL(chrome::kChromeUIThumbnailURL))) {
ThumbnailSource* thumbnail_source = new ThumbnailSource(profile_);
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/icon_loader_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698