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

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

Issue 1475883002: Revert of New build flag system, convert Google Now flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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') | tools/grit/grit/util.py » ('j') | 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/features.h"
9 #include "chrome/common/pref_font_webkit_names.h" 8 #include "chrome/common/pref_font_webkit_names.h"
10 9
11 namespace prefs { 10 namespace prefs {
12 11
13 // *************** PROFILE PREFS *************** 12 // *************** PROFILE PREFS ***************
14 // These are attached to the user profile 13 // These are attached to the user profile
15 14
16 15
17 // A bool pref that keeps whether the child status for this profile was already 16 // A bool pref that keeps whether the child status for this profile was already
18 // successfully checked via ChildAccountService. 17 // successfully checked via ChildAccountService.
(...skipping 1532 matching lines...) Expand 10 before | Expand all | Expand 10 after
1551 1550
1552 // Dictionary that maps Geolocation network provider server URLs to 1551 // Dictionary that maps Geolocation network provider server URLs to
1553 // corresponding access token. 1552 // corresponding access token.
1554 const char kGeolocationAccessToken[] = "geolocation.access_token"; 1553 const char kGeolocationAccessToken[] = "geolocation.access_token";
1555 1554
1556 #if defined(OS_ANDROID) 1555 #if defined(OS_ANDROID)
1557 // Boolean that controls the enabled-state of Geolocation in content. 1556 // Boolean that controls the enabled-state of Geolocation in content.
1558 const char kGeolocationEnabled[] = "geolocation.enabled"; 1557 const char kGeolocationEnabled[] = "geolocation.enabled";
1559 #endif 1558 #endif
1560 1559
1561 #if BUILDFLAG(ENABLE_GOOGLE_NOW) 1560 #if defined(ENABLE_GOOGLE_NOW)
1562 // Boolean that is true when Google services can use the user's location. 1561 // Boolean that is true when Google services can use the user's location.
1563 const char kGoogleGeolocationAccessEnabled[] = 1562 const char kGoogleGeolocationAccessEnabled[] =
1564 "googlegeolocationaccess.enabled"; 1563 "googlegeolocationaccess.enabled";
1565 #endif 1564 #endif
1566 1565
1567 // Boolean that specifies whether to enable the Google Now Launcher extension. 1566 // Boolean that specifies whether to enable the Google Now Launcher extension.
1568 // Note: This is not the notifications component gated by ENABLE_GOOGLE_NOW. 1567 // Note: This is not the notifications component gated by ENABLE_GOOGLE_NOW.
1569 const char kGoogleNowLauncherEnabled[] = "google_now_launcher.enabled"; 1568 const char kGoogleNowLauncherEnabled[] = "google_now_launcher.enabled";
1570 1569
1571 // The default audio capture device used by the Media content setting. 1570 // The default audio capture device used by the Media content setting.
(...skipping 600 matching lines...) Expand 10 before | Expand all | Expand 10 after
2172 // Policy that indicates how to handle animated images. 2171 // Policy that indicates how to handle animated images.
2173 const char kAnimationPolicy[] = "settings.a11y.animation_policy"; 2172 const char kAnimationPolicy[] = "settings.a11y.animation_policy";
2174 #endif 2173 #endif
2175 2174
2176 const char kBackgroundTracingLastUpload[] = "background_tracing.last_upload"; 2175 const char kBackgroundTracingLastUpload[] = "background_tracing.last_upload";
2177 2176
2178 const char kAllowDinosaurEasterEgg[] = 2177 const char kAllowDinosaurEasterEgg[] =
2179 "allow_dinosaur_easter_egg"; 2178 "allow_dinosaur_easter_egg";
2180 2179
2181 } // namespace prefs 2180 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/common/pref_names.h ('k') | tools/grit/grit/util.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698