Enables storing shelf's auto_hide_behavior and alignment per display.

ash/shell.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 "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/focus_manager_factory.h"
@@ skipping 700 matching lines @@
   GetRootWindowController(root_window)->SetShelfAutoHideBehavior(behavior);
 }
 
 ShelfAutoHideBehavior Shell::GetShelfAutoHideBehavior(
     aura::RootWindow* root_window) const {
   return GetRootWindowController(root_window)->GetShelfAutoHideBehavior();
 }
 
 void Shell::SetShelfAlignment(ShelfAlignment alignment,
                               aura::RootWindow* root_window) {
-  if (GetRootWindowController(root_window)->SetShelfAlignment(alignment))
-    FOR_EACH_OBSERVER(ShellObserver, observers_, OnShelfAlignmentChanged());
+  if (GetRootWindowController(root_window)->SetShelfAlignment(alignment)) {
+    FOR_EACH_OBSERVER(
+        ShellObserver, observers_, OnShelfAlignmentChanged(root_window));
+  }
 }
 
 ShelfAlignment Shell::GetShelfAlignment(aura::RootWindow* root_window) {
   return GetRootWindowController(root_window)->GetShelfAlignment();
 }
 
 void Shell::SetDimming(bool should_dim) {
   RootWindowControllerList controllers = GetAllRootWindowControllers();
   for (RootWindowControllerList::iterator iter = controllers.begin();
        iter != controllers.end(); ++iter)
@@ skipping 163 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, aura::client::ActivationChangeObserver implementation:
 
 void Shell::OnWindowActivated(aura::Window* gained_active,
                               aura::Window* lost_active) {
   if (gained_active)
     active_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash