OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/search/hotword_service_factory.h" | 5 #include "chrome/browser/search/hotword_service_factory.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
| 9 #include "build/build_config.h" |
9 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/search/hotword_service.h" | 11 #include "chrome/browser/search/hotword_service.h" |
11 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
12 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
13 #include "components/keyed_service/content/browser_context_dependency_manager.h" | 14 #include "components/keyed_service/content/browser_context_dependency_manager.h" |
14 #include "components/pref_registry/pref_registry_syncable.h" | 15 #include "components/pref_registry/pref_registry_syncable.h" |
15 #include "content/public/browser/browser_context.h" | 16 #include "content/public/browser/browser_context.h" |
16 #include "content/public/browser/browser_thread.h" | 17 #include "content/public/browser/browser_thread.h" |
17 | 18 |
18 using content::BrowserContext; | 19 using content::BrowserContext; |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 // Per-device settings (do not sync). | 87 // Per-device settings (do not sync). |
87 prefs->RegisterBooleanPref(prefs::kHotwordSearchEnabled, false); | 88 prefs->RegisterBooleanPref(prefs::kHotwordSearchEnabled, false); |
88 prefs->RegisterBooleanPref(prefs::kHotwordAlwaysOnSearchEnabled, false); | 89 prefs->RegisterBooleanPref(prefs::kHotwordAlwaysOnSearchEnabled, false); |
89 prefs->RegisterBooleanPref(prefs::kHotwordAlwaysOnNotificationSeen, false); | 90 prefs->RegisterBooleanPref(prefs::kHotwordAlwaysOnNotificationSeen, false); |
90 } | 91 } |
91 | 92 |
92 KeyedService* HotwordServiceFactory::BuildServiceInstanceFor( | 93 KeyedService* HotwordServiceFactory::BuildServiceInstanceFor( |
93 BrowserContext* context) const { | 94 BrowserContext* context) const { |
94 return new HotwordService(Profile::FromBrowserContext(context)); | 95 return new HotwordService(Profile::FromBrowserContext(context)); |
95 } | 96 } |
OLD | NEW |