Folds WmRootWindowController into RootWindowController

ash/common/wm/workspace/workspace_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_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
 #define ASH_COMMON_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
 
 #include <memory>
 #include <set>
 
 #include "ash/ash_export.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/wm/window_state_observer.h"
 #include "ash/common/wm/wm_types.h"
 #include "ash/common/wm_activation_observer.h"
 #include "ash/common/wm_layout_manager.h"
 #include "ash/common/wm_window_observer.h"
 #include "base/macros.h"
 #include "ui/display/display_observer.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/keyboard/keyboard_controller_observer.h"
 
 namespace ash {
+class RootWindowController;
 class WmShell;
-class WmRootWindowController;
 class WorkspaceLayoutManagerBackdropDelegate;
 
 namespace wm {
 class WMEvent;
 }
 
 // LayoutManager used on the window created for a workspace.
 class ASH_EXPORT WorkspaceLayoutManager
     : public WmLayoutManager,
       public WmWindowObserver,
@@ skipping 73 matching lines @@
   // Updates the fullscreen state of the workspace and notifies Shell if it
   // has changed.
   void UpdateFullscreenState();
 
   // Updates the always-on-top state for windows managed by this layout
   // manager.
   void UpdateAlwaysOnTop(WmWindow* window_on_top);
 
   WmWindow* window_;
   WmWindow* root_window_;
-  WmRootWindowController* root_window_controller_;
+  RootWindowController* root_window_controller_;
   WmShell* shell_;
 
   // Set of windows we're listening to.
   WindowSet windows_;
 
   // The work area in the coordinates of |window_|.
   gfx::Rect work_area_in_parent_;
 
   // True if this workspace is currently in fullscreen mode.
   bool is_fullscreen_;
 
   // A window which covers the full container and which gets inserted behind the
   // topmost visible window.
   std::unique_ptr<WorkspaceLayoutManagerBackdropDelegate> backdrop_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_