Splits shelf alignment and auto-hide behavior into two values, one

chrome/browser/prefs/pref_service.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.
 
 // This provides a way to access the application's current preferences.
 
 // Chromium settings and storage represent user-selected preferences and
 // information and MUST not be extracted, overwritten or modified except
 // through Chromium defined APIs.
 
 #ifndef CHROME_BROWSER_PREFS_PREF_SERVICE_H_
 #define CHROME_BROWSER_PREFS_PREF_SERVICE_H_
 
 #include <set>
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/hash_tables.h"
+#include "base/observer_list.h"
 #include "base/prefs/public/pref_service_base.h"
 #include "base/threading/non_thread_safe.h"
 
 class CommandLine;
 class DefaultPrefStore;
 class PersistentPrefStore;
 class PrefModelAssociator;
 class PrefNotifier;
 class PrefNotifierImpl;
+class PrefServiceObserver;
 class PrefStore;
 class PrefValueStore;
 
 namespace syncer {
 class SyncableService;
 }
 
 namespace policy {
 class PolicyService;
 }
@@ skipping 82 matching lines @@
 
   // Reloads the data from file. This should only be called when the importer
   // is running during first run, and the main process may not change pref
   // values while the importer process is running. Returns true on success.
   bool ReloadPersistentPrefs();
 
   // Lands pending writes to disk. This should only be used if we need to save
   // immediately (basically, during shutdown).
   void CommitPendingWrite();
 
+  void AddObserver(PrefServiceObserver* observer);
+  void RemoveObserver(PrefServiceObserver* observer);
+
+  // Returns true if preferences state has synchronized with the remote
+  // preferences. If true is returned it can be assumed the local preferences
+  // has applied changes from the remote preferences. The two may not be
+  // identical if a change is in flight (from either side).
+  bool HasSynced();
+
+  // Invoked internally when the HasSynced() state changes.
+  void HasSyncedChanged();
+
   // PrefServiceBase implementation.
   virtual bool IsManagedPreference(const char* pref_name) const OVERRIDE;
   virtual bool IsUserModifiablePreference(const char* pref_name) const OVERRIDE;
   virtual void RegisterBooleanPref(const char* path,
                                    bool default_value) OVERRIDE;
   virtual void RegisterIntegerPref(const char* path,
                                    int default_value) OVERRIDE;
   virtual void RegisterDoublePref(const char* path,
                                   double default_value) OVERRIDE;
   virtual void RegisterStringPref(const char* path,
@@ skipping 193 matching lines @@
   mutable PreferenceMap prefs_map_;
 
   // The model associator that maintains the links with the sync db.
   scoped_ptr<PrefModelAssociator> pref_sync_associator_;
 
   // Whether CreateIncognitoPrefService() or
   // CreatePrefServiceWithPerTabPrefStore() have been called to create a
   // "forked" PrefService.
   bool pref_service_forked_;
 
+  ObserverList<PrefServiceObserver> observer_list_;
+
   DISALLOW_COPY_AND_ASSIGN(PrefService);
 };
 
 #endif  // CHROME_BROWSER_PREFS_PREF_SERVICE_H_