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

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

Issue 136693013: [Hotword] Remove unneeded preferences. Cleaning up look of settings. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: wrong section name in test Created 6 years, 10 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
« no previous file with comments | « chrome/common/pref_names.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2061 matching lines...) Expand 10 before | Expand all | Expand 10 after
2072 // Holds URL patterns that specify URLs that will be granted access to video 2072 // Holds URL patterns that specify URLs that will be granted access to video
2073 // capture devices without prompt. NOTE: This whitelist is currently only 2073 // capture devices without prompt. NOTE: This whitelist is currently only
2074 // supported when running in kiosk mode. 2074 // supported when running in kiosk mode.
2075 // TODO(tommi): Update comment when this is supported for all modes. 2075 // TODO(tommi): Update comment when this is supported for all modes.
2076 const char kVideoCaptureAllowedUrls[] = "hardware.video_capture_allowed_urls"; 2076 const char kVideoCaptureAllowedUrls[] = "hardware.video_capture_allowed_urls";
2077 2077
2078 // A boolean pref that controls the enabled-state of hotword search voice 2078 // A boolean pref that controls the enabled-state of hotword search voice
2079 // trigger. 2079 // trigger.
2080 const char kHotwordSearchEnabled[] = "hotword.search_enabled"; 2080 const char kHotwordSearchEnabled[] = "hotword.search_enabled";
2081 2081
2082 // A boolean pref that controls the enabled-state of hotword search voice
2083 // trigger when using incognito mode.
2084 const char kHotwordSearchIncognitoEnabled[] =
2085 "hotword.incognito_search_enabled";
2086
2087 // An integer pref that keeps track of how many times the opt in popup for 2082 // An integer pref that keeps track of how many times the opt in popup for
2088 // hotword void search has been shown to the user. After this pref has reached 2083 // hotword void search has been shown to the user. After this pref has reached
2089 // the maximum number of times as defined by the HotwordService, the popup is no 2084 // the maximum number of times as defined by the HotwordService, the popup is no
2090 // longer shown. 2085 // longer shown.
2091 const char kHotwordOptInPopupTimesShown[] = "hotword.opt_in_popup_times_shown"; 2086 const char kHotwordOptInPopupTimesShown[] = "hotword.opt_in_popup_times_shown";
2092 2087
2093 // A boolean pref that controls whether hotword search voice trigger stops
2094 // listening after 5 minutes.
2095 const char kHotwordSearchTimeoutEnabled[] = "hotword.search_timeout_enabled";
2096
2097 #if defined(OS_ANDROID) 2088 #if defined(OS_ANDROID)
2098 // Boolean that controls the global enabled-state of protected media identifier. 2089 // Boolean that controls the global enabled-state of protected media identifier.
2099 const char kProtectedMediaIdentifierEnabled[] = 2090 const char kProtectedMediaIdentifierEnabled[] =
2100 "protected_media_identifier.enabled"; 2091 "protected_media_identifier.enabled";
2101 #endif 2092 #endif
2102 2093
2103 #if defined(OS_CHROMEOS) 2094 #if defined(OS_CHROMEOS)
2104 // Dictionary for transient storage of settings that should go into device 2095 // Dictionary for transient storage of settings that should go into device
2105 // settings storage before owner has been assigned. 2096 // settings storage before owner has been assigned.
2106 const char kDeviceSettingsCache[] = "signed_settings_cache"; 2097 const char kDeviceSettingsCache[] = "signed_settings_cache";
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after
2626 2617
2627 // The number of seconds since epoch that the OS password was last changed. 2618 // The number of seconds since epoch that the OS password was last changed.
2628 const char kOsPasswordLastChanged[] = 2619 const char kOsPasswordLastChanged[] =
2629 "password_manager.os_password_last_changed"; 2620 "password_manager.os_password_last_changed";
2630 #endif 2621 #endif
2631 2622
2632 // Whether DNS Quick Check is disabled in proxy resolution. 2623 // Whether DNS Quick Check is disabled in proxy resolution.
2633 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled"; 2624 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled";
2634 2625
2635 } // namespace prefs 2626 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/common/pref_names.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698