Makes WorkspaceLayoutManager use ash/wm/common types

ash/shelf/shelf_layout_manager.h

 // Copyright 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.
 
 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 138 matching lines @@
   // shelf. Specifying 0 leads to use the default.
   void SetAnimationDurationOverride(int duration_override_in_ms);
 
   // Overridden from SnapLayoutManager:
   void OnWindowResized() override;
   void SetChildBounds(aura::Window* child,
                       const gfx::Rect& requested_bounds) override;
 
   // Overridden from ash::ShellObserver:
   void OnLockStateChanged(bool locked) override;
-  void OnShelfAlignmentChanged(aura::Window* root_window) override;
   void OnShelfAutoHideBehaviorChanged(aura::Window* root_window) override;
 
   // Overriden from aura::client::ActivationChangeObserver:
   void OnWindowActivated(
       aura::client::ActivationChangeObserver::ActivationReason reason,
       aura::Window* gained_active,
       aura::Window* lost_active) override;
 
   // Overridden from ash::LockStateObserver:
   void OnLockStateEvent(LockStateObserver::EventType event) override;
@@ skipping 39 matching lines @@
 
   // Is the shelf's alignment horizontal?
   bool IsHorizontalAlignment() const;
 
   // Set the height of the ChromeVox panel, which takes away space from the
   // available work area from the top of the screen.
   void SetChromeVoxPanelHeight(int height);
 
  private:
   class AutoHideEventFilter;
+  class RootWindowControllerObserverImpl;
   class UpdateShelfObserver;
   friend class AshPopupAlignmentDelegateTest;
   friend class ash::ScreenAsh;
   friend class PanelLayoutManagerTest;
   friend class ShelfLayoutManagerTest;
   friend class ToastManagerTest;
   FRIEND_TEST_ALL_PREFIXES(ash::AshPopupAlignmentDelegateTest, AutoHide);
   FRIEND_TEST_ALL_PREFIXES(ash::WebNotificationTrayTest, PopupAndFullscreen);
 
   struct TargetBounds {
@@ skipping 162 matching lines @@
   // keyboard.
   gfx::Rect user_work_area_bounds_;
 
   // The height of the ChromeVox panel at the top of the screen, which
   // needs to be removed from the available work area.
   int chromevox_panel_height_;
 
   // The show hide animation duration override or 0 for default.
   int duration_override_in_ms_;
 
+  std::unique_ptr<RootWindowControllerObserverImpl>
+      root_window_controller_observer_;
+
   DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_