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

chrome/common/pref_names.h

 // 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.
 
 // Constants for the names of various preferences, for easier changing.
 
 #ifndef CHROME_COMMON_PREF_NAMES_H_
 #define CHROME_COMMON_PREF_NAMES_H_
 #pragma once
 
@@ skipping 614 matching lines @@
 
 #if defined(OS_CHROMEOS)
 extern const char kSignedSettingsCache[];
 extern const char kHardwareKeyboardLayout[];
 extern const char kCarrierDealPromoShown[];
 extern const char kShouldAutoEnroll[];
 extern const char kAutoEnrollmentPowerLimit[];
 extern const char kReportDeviceVersionInfo[];
 extern const char kReportDeviceActivityTimes[];
 extern const char kDeviceActivityTimes[];
+extern const char kSyncSpareBootstrapToken[];
 #endif
 
 extern const char kClearPluginLSODataEnabled[];
 extern const char kDiskCacheDir[];
 extern const char kDiskCacheSize[];
 extern const char kMediaCacheSize[];
 
 extern const char kChromeOsReleaseChannel[];
 
 extern const char kRegisteredBackgroundContents[];
@@ skipping 37 matching lines @@
 
 extern const char kShelfAutoHideBehavior[];
 
 #endif
 
 extern const char kInManagedMode[];
 
 }  // namespace prefs
 
 #endif  // CHROME_COMMON_PREF_NAMES_H_