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

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

Issue 2212463002: Merge "arc: Use location service consent." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2785
Patch Set: Created 4 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/macros.h" 7 #include "base/macros.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "chrome/common/pref_font_webkit_names.h" 9 #include "chrome/common/pref_font_webkit_names.h"
10 10
11 namespace prefs { 11 namespace prefs {
12 12
13 // *************** PROFILE PREFS *************** 13 // *************** PROFILE PREFS ***************
14 // These are attached to the user profile 14 // These are attached to the user profile
15 15
16 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) 16 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST)
17 // A preference to keep list of Android apps and their state. 17 // A preference to keep list of Android apps and their state.
18 const char kArcApps[] = "arc.apps"; 18 const char kArcApps[] = "arc.apps";
19 // A preference to store backup and restore state for Android apps. 19 // A preference to store backup and restore state for Android apps.
20 const char kArcBackupRestoreEnabled[] = "arc.backup_restore.enabled"; 20 const char kArcBackupRestoreEnabled[] = "arc.backup_restore.enabled";
21 // A preference to keep Android apps enabled state. 21 // A preference to keep Android apps enabled state.
22 const char kArcEnabled[] = "arc.enabled"; 22 const char kArcEnabled[] = "arc.enabled";
23 // A preference to keep user's consent to use location service.
24 const char kArcLocationServiceEnabled[] = "arc.location_service.enabled";
23 // A preference to keep list of Android packages and their infomation. 25 // A preference to keep list of Android packages and their infomation.
24 const char kArcPackages[] = "arc.packages"; 26 const char kArcPackages[] = "arc.packages";
25 // A preference to keep deferred requests of setting notifications enabled flag. 27 // A preference to keep deferred requests of setting notifications enabled flag.
26 const char kArcSetNotificationsEnabledDeferred[] = 28 const char kArcSetNotificationsEnabledDeferred[] =
27 "arc.set_notifications_enabled_deferred"; 29 "arc.set_notifications_enabled_deferred";
28 // A preference that indicates status of Android sign-in. 30 // A preference that indicates status of Android sign-in.
29 const char kArcSignedIn[] = "arc.signedin"; 31 const char kArcSignedIn[] = "arc.signedin";
30 #endif 32 #endif
31 33
32 // A bool pref that keeps whether the child status for this profile was already 34 // A bool pref that keeps whether the child status for this profile was already
(...skipping 2223 matching lines...) Expand 10 before | Expand all | Expand 10 after
2256 #endif 2258 #endif
2257 2259
2258 // The base64-encoded representation of the public key to use to validate origin 2260 // The base64-encoded representation of the public key to use to validate origin
2259 // trial token signatures. 2261 // trial token signatures.
2260 const char kOriginTrialPublicKey[] = "origin_trials.public_key"; 2262 const char kOriginTrialPublicKey[] = "origin_trials.public_key";
2261 2263
2262 // A list of origin trial features to disable by policy. 2264 // A list of origin trial features to disable by policy.
2263 const char kOriginTrialDisabledFeatures[] = "origin_trials.disabled_features"; 2265 const char kOriginTrialDisabledFeatures[] = "origin_trials.disabled_features";
2264 2266
2265 } // namespace prefs 2267 } // 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