suppress user/password dialog when re-enabling sync

chrome/browser/sync/sync_prefs.h

Index: chrome/browser/sync/sync_prefs.h
diff --git a/chrome/browser/sync/sync_prefs.h b/chrome/browser/sync/sync_prefs.h
index b6bdfc111caf653fdddc8c60f4e0e49fa7605bae..9c4f555b4981a491b724f75ae2e92b7f768dfcb0 100644
--- a/chrome/browser/sync/sync_prefs.h
+++ b/chrome/browser/sync/sync_prefs.h
@@ -95,9 +95,15 @@ class SyncPrefs : public base::SupportsWeakPtr<SyncPrefs>,
   // This pref is set outside of sync.
   bool IsManaged() const;
 
+  // Use this encryption bootstrap token once already syncing.
   std::string GetEncryptionBootstrapToken() const;
   void SetEncryptionBootstrapToken(const std::string& token);
 
+  // Use this spare bootstrap token only when setting up sync for the first
+  // time.
+  std::string GetSpareBootstrapToken() const;

[Nicolas Zea, 2012/04/03 23:47:20]

Since the preference exists only on ChromeOS, these methods should probably be
conditioned on OS_CHROMEOS as well

[kochi, 2012/04/04 00:10:20]

Done.

+  void SetSpareBootstrapToken(const std::string& token);
+
   // InvalidationVersionTracker implementation.
   virtual sync_notifier::InvalidationVersionMap
       GetAllMaxVersions() const OVERRIDE;