Folds WmRootWindowController into RootWindowController

ash/common/wm/panels/panel_layout_manager.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.
 
 #ifndef ASH_COMMON_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
 #define ASH_COMMON_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
 
 #include <list>
 #include <memory>
 
@@ skipping 18 matching lines @@
 
 namespace views {
 class Widget;
 }
 
 namespace ash {
 class PanelCalloutWidget;
 class WmShelf;
 
 namespace wm {
-class WmRootWindowController;
+class RootWindowController;
 }
 
 // PanelLayoutManager is responsible for organizing panels within the
 // workspace. It is associated with a specific container window (i.e.
 // kShellWindowId_PanelContainer) and controls the layout of any windows
 // added to that container.
 //
 // The constructor takes a |panel_container| argument which is expected to set
 // its layout manager to this instance, e.g.:
 // panel_container->SetLayoutManager(new PanelLayoutManager(panel_container));
@@ skipping 113 matching lines @@
   // Update the callout arrows for all managed panels.
   void UpdateCallouts();
 
   // Overridden from keyboard::KeyboardControllerObserver:
   void OnKeyboardBoundsChanging(const gfx::Rect& keyboard_bounds) override;
   void OnKeyboardClosed() override;
 
   // Parent window associated with this layout manager.
   WmWindow* panel_container_;
 
-  WmRootWindowController* root_window_controller_;
+  RootWindowController* root_window_controller_;
 
   // Protect against recursive calls to OnWindowAddedToLayout().
   bool in_add_window_;
   // Protect against recursive calls to Relayout().
   bool in_layout_;
   // Indicates if the panel callout widget should be created.
   bool show_callout_widgets_;
   // Ordered list of unowned pointers to panel windows.
   PanelList panel_windows_;
   // The panel being dragged.
@@ skipping 10 matching lines @@
   // are currently focused.
   WmWindow* last_active_panel_;
   base::WeakPtrFactory<PanelLayoutManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PanelLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_PANELS_PANEL_LAYOUT_MANAGER_H_