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

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

Issue 938713004: Add Now setting and migration logic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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 1649 matching lines...) Expand 10 before | Expand all | Expand 10 after
1660 // Boolean that controls the enabled-state of Geolocation in content. 1660 // Boolean that controls the enabled-state of Geolocation in content.
1661 const char kGeolocationEnabled[] = "geolocation.enabled"; 1661 const char kGeolocationEnabled[] = "geolocation.enabled";
1662 #endif 1662 #endif
1663 1663
1664 #if defined(ENABLE_GOOGLE_NOW) 1664 #if defined(ENABLE_GOOGLE_NOW)
1665 // Boolean that is true when Google services can use the user's location. 1665 // Boolean that is true when Google services can use the user's location.
1666 const char kGoogleGeolocationAccessEnabled[] = 1666 const char kGoogleGeolocationAccessEnabled[] =
1667 "googlegeolocationaccess.enabled"; 1667 "googlegeolocationaccess.enabled";
1668 #endif 1668 #endif
1669 1669
1670 // Boolean that specifies whether to enable the Google Now Launcher extension.
1671 // Note: this is not the notifications component gated by ENABLE_GOOGLE_NOW.
robliao 2015/02/19 18:43:25 Nit: Capitalize "this"
skare_ 2015/02/19 20:19:29 Done.
1672 const char kGoogleNowLauncherEnabled[] = "google_now_launcher.enabled";
1673
1670 // The default audio capture device used by the Media content setting. 1674 // The default audio capture device used by the Media content setting.
1671 const char kDefaultAudioCaptureDevice[] = "media.default_audio_capture_device"; 1675 const char kDefaultAudioCaptureDevice[] = "media.default_audio_capture_device";
1672 1676
1673 // The default video capture device used by the Media content setting. 1677 // The default video capture device used by the Media content setting.
1674 const char kDefaultVideoCaptureDevice[] = "media.default_video_capture_Device"; 1678 const char kDefaultVideoCaptureDevice[] = "media.default_video_capture_Device";
1675 1679
1676 // The salt used for creating random MediaSource IDs. 1680 // The salt used for creating random MediaSource IDs.
1677 const char kMediaDeviceIdSalt[] = "media.device_id_salt"; 1681 const char kMediaDeviceIdSalt[] = "media.device_id_salt";
1678 1682
1679 // The last used printer and its settings. 1683 // The last used printer and its settings.
(...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after
2282 // (name and a list of clients that registered the whitelist). 2286 // (name and a list of clients that registered the whitelist).
2283 const char kRegisteredSupervisedUserWhitelists[] = 2287 const char kRegisteredSupervisedUserWhitelists[] =
2284 "supervised_users.whitelists"; 2288 "supervised_users.whitelists";
2285 2289
2286 #if defined(ENABLE_EXTENSIONS) 2290 #if defined(ENABLE_EXTENSIONS)
2287 // Policy that indicates how to handle animated images. 2291 // Policy that indicates how to handle animated images.
2288 const char kAnimationPolicy[] = "settings.a11y.animation_policy"; 2292 const char kAnimationPolicy[] = "settings.a11y.animation_policy";
2289 #endif 2293 #endif
2290 2294
2291 } // namespace prefs 2295 } // 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