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

Side by Side Diff: chrome/common/pref_names.cc

Issue 134103005: [Hotword] Putting preferences under search for hotword service. Putting behind a flag. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixing margin and color Created 6 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/common/pref_names.h" 5 #include "chrome/common/pref_names.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "chrome/common/pref_font_webkit_names.h" 8 #include "chrome/common/pref_font_webkit_names.h"
9 9
10 namespace prefs { 10 namespace prefs {
(...skipping 2135 matching lines...) Expand 10 before | Expand all | Expand 10 after
2146 2146
2147 // A boolean pref that controls the enabled-state of hotword search voice 2147 // A boolean pref that controls the enabled-state of hotword search voice
2148 // trigger. 2148 // trigger.
2149 const char kHotwordSearchEnabled[] = "hotword.search_enabled"; 2149 const char kHotwordSearchEnabled[] = "hotword.search_enabled";
2150 2150
2151 // A boolean pref that controls the enabled-state of hotword search voice 2151 // A boolean pref that controls the enabled-state of hotword search voice
2152 // trigger when using incognito mode. 2152 // trigger when using incognito mode.
2153 const char kHotwordSearchIncognitoEnabled[] = 2153 const char kHotwordSearchIncognitoEnabled[] =
2154 "hotword.incognito_search_enabled"; 2154 "hotword.incognito_search_enabled";
2155 2155
2156 // A boolean pref that controls whether hotword search voice trigger stops
2157 // listening after 5 minutes.
2158 const char kHotwordSearchTimeoutEnabled[] =
2159 "hotword.search_timeout_enabled";
2160
2156 #if defined(OS_ANDROID) 2161 #if defined(OS_ANDROID)
2157 // Boolean that controls the global enabled-state of protected media identifier. 2162 // Boolean that controls the global enabled-state of protected media identifier.
2158 const char kProtectedMediaIdentifierEnabled[] = 2163 const char kProtectedMediaIdentifierEnabled[] =
2159 "protected_media_identifier.enabled"; 2164 "protected_media_identifier.enabled";
2160 #endif 2165 #endif
2161 2166
2162 #if defined(OS_CHROMEOS) 2167 #if defined(OS_CHROMEOS)
2163 // Dictionary for transient storage of settings that should go into device 2168 // Dictionary for transient storage of settings that should go into device
2164 // settings storage before owner has been assigned. 2169 // settings storage before owner has been assigned.
2165 const char kDeviceSettingsCache[] = "signed_settings_cache"; 2170 const char kDeviceSettingsCache[] = "signed_settings_cache";
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after
2685 2690
2686 // The number of seconds since epoch that the OS password was last changed. 2691 // The number of seconds since epoch that the OS password was last changed.
2687 const char kOsPasswordLastChanged[] = 2692 const char kOsPasswordLastChanged[] =
2688 "password_manager.os_password_last_changed"; 2693 "password_manager.os_password_last_changed";
2689 #endif 2694 #endif
2690 2695
2691 // Whether DNS Quick Check is disabled in proxy resolution. 2696 // Whether DNS Quick Check is disabled in proxy resolution.
2692 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled"; 2697 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled";
2693 2698
2694 } // namespace prefs 2699 } // namespace prefs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698