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

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: fixed errors 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
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 1760 matching lines...) Expand 10 before | Expand all | Expand 10 after
1771 // Holds URL patterns that specify URLs that will be granted access to video 1771 // Holds URL patterns that specify URLs that will be granted access to video
1772 // capture devices without prompt. NOTE: This whitelist is currently only 1772 // capture devices without prompt. NOTE: This whitelist is currently only
1773 // supported when running in kiosk mode. 1773 // supported when running in kiosk mode.
1774 // TODO(tommi): Update comment when this is supported for all modes. 1774 // TODO(tommi): Update comment when this is supported for all modes.
1775 const char kVideoCaptureAllowedUrls[] = "hardware.video_capture_allowed_urls"; 1775 const char kVideoCaptureAllowedUrls[] = "hardware.video_capture_allowed_urls";
1776 1776
1777 // A boolean pref that controls the enabled-state of hotword search voice 1777 // A boolean pref that controls the enabled-state of hotword search voice
1778 // trigger. 1778 // trigger.
1779 const char kHotwordSearchEnabled[] = "hotword.search_enabled_2"; 1779 const char kHotwordSearchEnabled[] = "hotword.search_enabled_2";
1780 1780
1781 // A boolean pref that controls the enabled-state of hotword search voice
1782 // trigger from any screen.
1783 const char kHotwordAlwaysOnSearchEnabled[] = "hotword.always_on_search_enabled";
Matt Giuca 2014/08/12 08:37:39 This needs to be in OS_CHROMEOS only (doesn't comp
Anand Mistry (off Chromium) 2014/08/12 08:46:35 Please don't guard this with OS_CHROMEOS. It shoul
rpetterson 2014/08/12 18:21:57 +1 My understanding is that although we'll be laun
kcarattini 2014/08/13 03:51:54 Done. Sorry, everyone! Leftover from before I merg
1784
1781 // A boolean pref that controls whether the sound of "Ok, Google" plus a few 1785 // A boolean pref that controls whether the sound of "Ok, Google" plus a few
1782 // seconds of audio data before is sent back to improve voice search. 1786 // seconds of audio data before is sent back to improve voice search.
1783 const char kHotwordAudioLoggingEnabled[] = "hotword.audio_logging_enabled"; 1787 const char kHotwordAudioLoggingEnabled[] = "hotword.audio_logging_enabled";
1784 1788
1785 // A string holding the locale information under which Hotword was installed. 1789 // A string holding the locale information under which Hotword was installed.
1786 // It is used for comparison since the hotword voice search trigger must be 1790 // It is used for comparison since the hotword voice search trigger must be
1787 // reinstalled to handle a new language. 1791 // reinstalled to handle a new language.
1788 const char kHotwordPreviousLanguage[] = "hotword.previous_language"; 1792 const char kHotwordPreviousLanguage[] = "hotword.previous_language";
1789 1793
1790 #if defined(OS_ANDROID) 1794 #if defined(OS_ANDROID)
(...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after
2316 // "mapped_title" entries, detailing the bookmark target URL (if any), the title 2320 // "mapped_title" entries, detailing the bookmark target URL (if any), the title
2317 // given by the PartnerBookmarksProvider and either the user-visible renamed 2321 // given by the PartnerBookmarksProvider and either the user-visible renamed
2318 // title or an empty string if the bookmark node was removed. 2322 // title or an empty string if the bookmark node was removed.
2319 const char kPartnerBookmarkMappings[] = "partnerbookmarks.mappings"; 2323 const char kPartnerBookmarkMappings[] = "partnerbookmarks.mappings";
2320 #endif 2324 #endif
2321 2325
2322 // Whether DNS Quick Check is disabled in proxy resolution. 2326 // Whether DNS Quick Check is disabled in proxy resolution.
2323 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled"; 2327 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled";
2324 2328
2325 } // namespace prefs 2329 } // namespace prefs
OLDNEW
« chrome/browser/ui/webui/options/browser_options_handler.cc ('K') | « chrome/common/pref_names.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698