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

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

Issue 460113005: Adds the audio history and always on hotwording settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review Comments Created 6 years, 4 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 1770 matching lines...) Expand 10 before | Expand all | Expand 10 after
1781 // Holds URL patterns that specify URLs that will be granted access to video 1781 // Holds URL patterns that specify URLs that will be granted access to video
1782 // capture devices without prompt. NOTE: This whitelist is currently only 1782 // capture devices without prompt. NOTE: This whitelist is currently only
1783 // supported when running in kiosk mode. 1783 // supported when running in kiosk mode.
1784 // TODO(tommi): Update comment when this is supported for all modes. 1784 // TODO(tommi): Update comment when this is supported for all modes.
1785 const char kVideoCaptureAllowedUrls[] = "hardware.video_capture_allowed_urls"; 1785 const char kVideoCaptureAllowedUrls[] = "hardware.video_capture_allowed_urls";
1786 1786
1787 // A boolean pref that controls the enabled-state of hotword search voice 1787 // A boolean pref that controls the enabled-state of hotword search voice
1788 // trigger. 1788 // trigger.
1789 const char kHotwordSearchEnabled[] = "hotword.search_enabled_2"; 1789 const char kHotwordSearchEnabled[] = "hotword.search_enabled_2";
1790 1790
1791 // A boolean pref that controls the enabled-state of hotword search voice
1792 // trigger from any screen.
1793 const char kHotwordAlwaysOnSearchEnabled[] = "hotword.always_on_search_enabled";
1794
1791 // A boolean pref that controls whether the sound of "Ok, Google" plus a few 1795 // A boolean pref that controls whether the sound of "Ok, Google" plus a few
1792 // seconds of audio data before is sent back to improve voice search. 1796 // seconds of audio data before is sent back to improve voice search.
1793 const char kHotwordAudioLoggingEnabled[] = "hotword.audio_logging_enabled"; 1797 const char kHotwordAudioLoggingEnabled[] = "hotword.audio_logging_enabled";
1794 1798
1795 // A string holding the locale information under which Hotword was installed. 1799 // A string holding the locale information under which Hotword was installed.
1796 // It is used for comparison since the hotword voice search trigger must be 1800 // It is used for comparison since the hotword voice search trigger must be
1797 // reinstalled to handle a new language. 1801 // reinstalled to handle a new language.
1798 const char kHotwordPreviousLanguage[] = "hotword.previous_language"; 1802 const char kHotwordPreviousLanguage[] = "hotword.previous_language";
1799 1803
1800 #if defined(OS_ANDROID) 1804 #if defined(OS_ANDROID)
(...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after
2326 // "mapped_title" entries, detailing the bookmark target URL (if any), the title 2330 // "mapped_title" entries, detailing the bookmark target URL (if any), the title
2327 // given by the PartnerBookmarksProvider and either the user-visible renamed 2331 // given by the PartnerBookmarksProvider and either the user-visible renamed
2328 // title or an empty string if the bookmark node was removed. 2332 // title or an empty string if the bookmark node was removed.
2329 const char kPartnerBookmarkMappings[] = "partnerbookmarks.mappings"; 2333 const char kPartnerBookmarkMappings[] = "partnerbookmarks.mappings";
2330 #endif 2334 #endif
2331 2335
2332 // Whether DNS Quick Check is disabled in proxy resolution. 2336 // Whether DNS Quick Check is disabled in proxy resolution.
2333 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled"; 2337 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled";
2334 2338
2335 } // namespace prefs 2339 } // 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