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

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

Issue 17320005: Update strings to match the final spec. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Null-check the signin manager for CrOS Created 7 years, 6 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 | Annotate | Revision Log
« 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 21 matching lines...) Expand all
32 32
33 // This is the URL of the page to load when opening new tabs. 33 // This is the URL of the page to load when opening new tabs.
34 const char kHomePage[] = "homepage"; 34 const char kHomePage[] = "homepage";
35 35
36 // Maps host names to whether the host is manually allowed or blocked. 36 // Maps host names to whether the host is manually allowed or blocked.
37 const char kManagedModeManualHosts[] = "profile.managed.manual_hosts"; 37 const char kManagedModeManualHosts[] = "profile.managed.manual_hosts";
38 // Maps URLs to whether the URL is manually allowed or blocked. 38 // Maps URLs to whether the URL is manually allowed or blocked.
39 const char kManagedModeManualURLs[] = "profile.managed.manual_urls"; 39 const char kManagedModeManualURLs[] = "profile.managed.manual_urls";
40 40
41 // Stores the email address associated with the google account of the custodian 41 // Stores the email address associated with the google account of the custodian
42 // of the managed user. 42 // of the managed user, set when the managed user is created.
43 const char kManagedUserCustodian[] = "profile.managed.custodian_email"; 43 const char kManagedUserCustodianEmail[] = "profile.managed.custodian_email";
44
45 // Stores the display name associated with the google account of the custodian
46 // of the managed user, updated (if possible) each time the managed user
47 // starts a session.
48 const char kManagedUserCustodianName[] = "profile.managed.custodian_name";
44 49
45 // Used to determine if the last session exited cleanly. Set to false when 50 // Used to determine if the last session exited cleanly. Set to false when
46 // first opened, and to true when closing. On startup if the value is false, 51 // first opened, and to true when closing. On startup if the value is false,
47 // it means the profile didn't exit cleanly. 52 // it means the profile didn't exit cleanly.
48 // DEPRECATED: this is replaced by kSessionExitType and exists for backwards 53 // DEPRECATED: this is replaced by kSessionExitType and exists for backwards
49 // compatability. 54 // compatability.
50 const char kSessionExitedCleanly[] = "profile.exited_cleanly"; 55 const char kSessionExitedCleanly[] = "profile.exited_cleanly";
51 56
52 // A string pref whose values is one of the values defined by 57 // A string pref whose values is one of the values defined by
53 // |ProfileImpl::kPrefExitTypeXXX|. Set to |kPrefExitTypeCrashed| on startup and 58 // |ProfileImpl::kPrefExitTypeXXX|. Set to |kPrefExitTypeCrashed| on startup and
(...skipping 2443 matching lines...) Expand 10 before | Expand all | Expand 10 after
2497 2502
2498 // How often the bubble has been shown. 2503 // How often the bubble has been shown.
2499 extern const char kModuleConflictBubbleShown[] = "module_conflict.bubble_shown"; 2504 extern const char kModuleConflictBubbleShown[] = "module_conflict.bubble_shown";
2500 2505
2501 // A string pref for storing the salt used to compute the pepper device ID. 2506 // A string pref for storing the salt used to compute the pepper device ID.
2502 const char kDRMSalt[] = "settings.privacy.drm_salt"; 2507 const char kDRMSalt[] = "settings.privacy.drm_salt";
2503 // A boolean pref that enables the (private) pepper GetDeviceID() call. 2508 // A boolean pref that enables the (private) pepper GetDeviceID() call.
2504 const char kEnableDRM[] = "settings.privacy.drm_enabled"; 2509 const char kEnableDRM[] = "settings.privacy.drm_enabled";
2505 2510
2506 } // namespace prefs 2511 } // 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