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

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

Issue 10020028: Merge 130722 - On ChromeOS, the user is always signed in and we should not (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1084/src/
Patch Set: Created 8 years, 8 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 8
9 namespace prefs { 9 namespace prefs {
10 10
(...skipping 1633 matching lines...) Expand 10 before | Expand all | Expand 10 after
1644 // reported along with device policy requests. 1644 // reported along with device policy requests.
1645 const char kReportDeviceVersionInfo[] = "device_status.report_version_info"; 1645 const char kReportDeviceVersionInfo[] = "device_status.report_version_info";
1646 1646
1647 // A boolean pref that indicates whether device activity times should be 1647 // A boolean pref that indicates whether device activity times should be
1648 // recorded and reported along with device policy requests. 1648 // recorded and reported along with device policy requests.
1649 const char kReportDeviceActivityTimes[] = "device_status.report_activity_times"; 1649 const char kReportDeviceActivityTimes[] = "device_status.report_activity_times";
1650 1650
1651 // The local state pref that stores device activity times before reporting 1651 // The local state pref that stores device activity times before reporting
1652 // them to the policy server. 1652 // them to the policy server.
1653 extern const char kDeviceActivityTimes[] = "device_status.activity_times"; 1653 extern const char kDeviceActivityTimes[] = "device_status.activity_times";
1654
1655 // A string that is used to store first-time sync startup after once sync is
1656 // disabled. This will be refreshed every sign-in.
1657 const char kSyncSpareBootstrapToken[] = "sync.spare_bootstrap_token";
1654 #endif 1658 #endif
1655 1659
1656 // Whether there is a Flash version installed that supports clearing LSO data. 1660 // Whether there is a Flash version installed that supports clearing LSO data.
1657 const char kClearPluginLSODataEnabled[] = "browser.clear_lso_data_enabled"; 1661 const char kClearPluginLSODataEnabled[] = "browser.clear_lso_data_enabled";
1658 1662
1659 // String which specifies where to store the disk cache. 1663 // String which specifies where to store the disk cache.
1660 const char kDiskCacheDir[] = "browser.disk_cache_dir"; 1664 const char kDiskCacheDir[] = "browser.disk_cache_dir";
1661 // Pref name for the policy specifying the maximal cache size. 1665 // Pref name for the policy specifying the maximal cache size.
1662 const char kDiskCacheSize[] = "browser.disk_cache_size"; 1666 const char kDiskCacheSize[] = "browser.disk_cache_size";
1663 // Pref name for the policy specifying the maximal media cache size. 1667 // Pref name for the policy specifying the maximal media cache size.
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
1810 1814
1811 // String value corresponding to ash::Shell::ShelfAutoHideBehavior. 1815 // String value corresponding to ash::Shell::ShelfAutoHideBehavior.
1812 const char kShelfAutoHideBehavior[] = "auto_hide_behavior"; 1816 const char kShelfAutoHideBehavior[] = "auto_hide_behavior";
1813 1817
1814 #endif 1818 #endif
1815 1819
1816 // Indicates whether the browser is in managed mode. 1820 // Indicates whether the browser is in managed mode.
1817 const char kInManagedMode[] = "managed_mode"; 1821 const char kInManagedMode[] = "managed_mode";
1818 1822
1819 } // namespace prefs 1823 } // 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