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

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

Issue 382113002: Only enable Hotwords when extensions are enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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/extensions/external_component_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/component_loader.cc
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 028fc155018a25154e31ead283aa937d8d206ea9..20d08009a2e3cbf2ce88a64753f6a7e87242f462 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -12,7 +12,6 @@
#include "base/metrics/field_trial.h"
#include "base/path_service.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/search/hotword_service_factory.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/chrome_version_info.h"
@@ -52,6 +51,10 @@
#include "grit/chromium_strings.h"
#endif
+#if defined(ENABLE_EXTENSIONS)
+#include "chrome/browser/search/hotword_service_factory.h"
+#endif
+
using content::BrowserThread;
namespace extensions {
@@ -302,10 +305,12 @@ void ComponentLoader::AddHangoutServicesExtension() {
}
void ComponentLoader::AddHotwordHelperExtension() {
+#if defined(ENABLE_EXTENSIONS)
if (HotwordServiceFactory::IsHotwordAllowed(browser_context_)) {
Add(IDR_HOTWORD_HELPER_MANIFEST,
base::FilePath(FILE_PATH_LITERAL("hotword_helper")));
}
+#endif
}
void ComponentLoader::AddImageLoaderExtension() {
« no previous file with comments | « no previous file | chrome/browser/extensions/external_component_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698