Merge 130722 - On ChromeOS, the user is always signed in and we should not

chrome/common/pref_names.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/pref_names.h"
 
 #include "base/basictypes.h"
 
 namespace prefs {
 
@@ skipping 1633 matching lines @@
 // reported along with device policy requests.
 const char kReportDeviceVersionInfo[] = "device_status.report_version_info";
 
 // A boolean pref that indicates whether device activity times should be
 // recorded and reported along with device policy requests.
 const char kReportDeviceActivityTimes[] = "device_status.report_activity_times";
 
 // The local state pref that stores device activity times before reporting
 // them to the policy server.
 extern const char kDeviceActivityTimes[] = "device_status.activity_times";
+
+// A string that is used to store first-time sync startup after once sync is
+// disabled. This will be refreshed every sign-in.
+const char kSyncSpareBootstrapToken[] = "sync.spare_bootstrap_token";
 #endif
 
 // Whether there is a Flash version installed that supports clearing LSO data.
 const char kClearPluginLSODataEnabled[] = "browser.clear_lso_data_enabled";
 
 // String which specifies where to store the disk cache.
 const char kDiskCacheDir[] = "browser.disk_cache_dir";
 // Pref name for the policy specifying the maximal cache size.
 const char kDiskCacheSize[] = "browser.disk_cache_size";
 // Pref name for the policy specifying the maximal media cache size.
@@ skipping 146 matching lines @@
 
 // String value corresponding to ash::Shell::ShelfAutoHideBehavior.
 const char kShelfAutoHideBehavior[] = "auto_hide_behavior";
 
 #endif
 
 // Indicates whether the browser is in managed mode.
 const char kInManagedMode[] = "managed_mode";
 
 }  // namespace prefs