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

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

Issue 386733002: Only build extensions code in chrome/browser/ui when extensions are enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | « no previous file | chrome/browser/profiles/off_the_record_profile_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_system_impl.cc
diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc
index 8e853085a61f02dd8832c245a020d400157fcb1f..ee61be99148f93dd989c94b9f2205dc536f742c0 100644
--- a/chrome/browser/extensions/extension_system_impl.cc
+++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -30,7 +30,6 @@
#include "chrome/browser/extensions/user_script_master.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/chrome_version_info.h"
#include "chrome/common/extensions/extension_constants.h"
@@ -61,6 +60,7 @@
#if defined(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/unpacked_installer.h"
+#include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
#endif
#if defined(ENABLE_NOTIFICATIONS)
@@ -364,8 +364,10 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
}
extension_service_->Init();
+#if defined(ENABLE_EXTENSIONS)
// Make the chrome://extension-icon/ resource available.
content::URLDataSource::Add(profile_, new ExtensionIconSource(profile_));
+#endif
extension_warning_service_.reset(new ExtensionWarningService(profile_));
extension_warning_badge_service_.reset(
« no previous file with comments | « no previous file | chrome/browser/profiles/off_the_record_profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698