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

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

Issue 10823212: Relanding this as this did not fix the chromiumos breakage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « chrome/common/pref_names.h ('k') | chrome/test/base/testing_browser_process.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
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 8
9 namespace prefs { 9 namespace prefs {
10 10
(...skipping 1827 matching lines...) Expand 10 before | Expand all | Expand 10 after
1838 // Possible values: "stable-channel", "beta-channel", "dev-channel", or an 1838 // Possible values: "stable-channel", "beta-channel", "dev-channel", or an
1839 // empty string, in which case the value will be ignored. 1839 // empty string, in which case the value will be ignored.
1840 // TODO(dubroy): This preference may not be necessary once 1840 // TODO(dubroy): This preference may not be necessary once
1841 // http://crosbug.com/17015 is implemented and the update engine can just 1841 // http://crosbug.com/17015 is implemented and the update engine can just
1842 // fetch the correct value from the policy. 1842 // fetch the correct value from the policy.
1843 const char kChromeOsReleaseChannel[] = "cros.system.releaseChannel"; 1843 const char kChromeOsReleaseChannel[] = "cros.system.releaseChannel";
1844 1844
1845 // Value of the enums in TabStrip::LayoutType as an int. 1845 // Value of the enums in TabStrip::LayoutType as an int.
1846 const char kTabStripLayoutType[] = "tab_strip_layout_type"; 1846 const char kTabStripLayoutType[] = "tab_strip_layout_type";
1847 1847
1848 // If true, cloud policy for the user is loaded once the user signs in.
1849 const char kLoadCloudPolicyOnSignin[] = "policy.load_cloud_policy_on_signin";
1850
1848 // *************** SERVICE PREFS *************** 1851 // *************** SERVICE PREFS ***************
1849 // These are attached to the service process. 1852 // These are attached to the service process.
1850 1853
1851 const char kCloudPrintProxyEnabled[] = "cloud_print.enabled"; 1854 const char kCloudPrintProxyEnabled[] = "cloud_print.enabled";
1852 // The unique id for this instance of the cloud print proxy. 1855 // The unique id for this instance of the cloud print proxy.
1853 const char kCloudPrintProxyId[] = "cloud_print.proxy_id"; 1856 const char kCloudPrintProxyId[] = "cloud_print.proxy_id";
1854 // The GAIA auth token for Cloud Print 1857 // The GAIA auth token for Cloud Print
1855 const char kCloudPrintAuthToken[] = "cloud_print.auth_token"; 1858 const char kCloudPrintAuthToken[] = "cloud_print.auth_token";
1856 // The GAIA auth token used by Cloud Print to authenticate with the XMPP server 1859 // The GAIA auth token used by Cloud Print to authenticate with the XMPP server
1857 // This should eventually go away because the above token should work for both. 1860 // This should eventually go away because the above token should work for both.
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
2031 const char kNetworkProfileLastWarningTime[] = 2034 const char kNetworkProfileLastWarningTime[] =
2032 "network_profile.last_warning_time"; 2035 "network_profile.last_warning_time";
2033 2036
2034 #if defined(OS_MACOSX) 2037 #if defined(OS_MACOSX)
2035 // A timestamp of when the obsolete OS infobar was last shown to a user on 10.5. 2038 // A timestamp of when the obsolete OS infobar was last shown to a user on 10.5.
2036 const char kMacLeopardObsoleteInfobarLastShown[] = 2039 const char kMacLeopardObsoleteInfobarLastShown[] =
2037 "mac_105_obsolete_infobar_last_shown"; 2040 "mac_105_obsolete_infobar_last_shown";
2038 #endif // defined(OS_MACOSX) 2041 #endif // defined(OS_MACOSX)
2039 2042
2040 } // namespace prefs 2043 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/common/pref_names.h ('k') | chrome/test/base/testing_browser_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698