chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc - Issue 382113002: Only enable Hotwords when extensions are enabled.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

Issue 382113002: Only enable Hotwords 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 | « chrome/browser/extensions/external_component_loader.cc ('k') | chrome/browser/resources/component_extension_resources.grd » ('j') | chrome/browser/resources/component_extension_resources.grd » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

index cb3829062d8028ad4d560075e547084b5b2a6cc3..2ef7118a3049900bde9ae2788c1d8254de30bdf3 100644

--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

@@ -30,7 +30,6 @@

#include "chrome/browser/prerender/prerender_manager_factory.h"

#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"

#include "chrome/browser/profiles/gaia_info_update_service_factory.h"

-#include "chrome/browser/search/hotword_service_factory.h"

#include "chrome/browser/search/instant_service_factory.h"

#include "chrome/browser/search/suggestions/suggestions_service_factory.h"

#include "chrome/browser/search_engines/template_url_fetcher_factory.h"

@@ -55,6 +54,7 @@

#include "chrome/browser/apps/ephemeral_app_service_factory.h"

#include "chrome/browser/apps/shortcut_manager_factory.h"

#include "chrome/browser/extensions/browser_context_keyed_service_factories.h"

+#include "chrome/browser/search/hotword_service_factory.h"

#include "extensions/browser/browser_context_keyed_service_factories.h"

#endif

@@ -186,7 +186,9 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {

GlobalErrorServiceFactory::GetInstance();

GoogleURLTrackerFactory::GetInstance();

HistoryServiceFactory::GetInstance();

+#if defined(ENABLE_EXTENSIONS)

HotwordServiceFactory::GetInstance();

+#endif

invalidation::ProfileInvalidationProviderFactory::GetInstance();

InstantServiceFactory::GetInstance();

#if defined(ENABLE_SERVICE_DISCOVERY)