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

chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
index 93d0631666e7ab49e5cfd480e79c7695ca34235c..2a564c03305fcff28ed9148d75baef4495fc5115 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
@@ -20,6 +20,7 @@
 #include "base/timer.h"
 #include "chrome/browser/api/prefs/pref_change_registrar.h"
 #include "chrome/browser/api/sync/profile_sync_service_observer.h"
+#include "chrome/browser/prefs/pref_service_observer.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ -54,7 +55,8 @@ class ChromeLauncherController
       public ash::LauncherModelObserver,
       public ash::ShellObserver,
       public content::NotificationObserver,
-      public ProfileSyncServiceObserver {
+      public ProfileSyncServiceObserver,
+      public PrefServiceObserver {
  public:
   // Indicates if a launcher item is incognito or not.
   enum IncognitoState {
@@ -267,6 +269,9 @@ class ChromeLauncherController
   // Overridden from ProfileSyncServiceObserver:
   virtual void OnStateChanged() OVERRIDE;
 
+  // Overriden from PrefServiceObserver:
+  virtual void OnHasSyncedChanged() OVERRIDE;
+
  private:
   friend class BrowserLauncherItemControllerTest;
   friend class ChromeLauncherControllerTest;