Centralizes more shared code between ash and mash

ash/root_window_controller.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_ROOT_WINDOW_CONTROLLER_H_
 #define ASH_ROOT_WINDOW_CONTROLLER_H_
 
 #include <map>
 #include <memory>
 
@@ skipping 28 matching lines @@
 }
 
 namespace wm {
 class InputMethodEventFilter;
 class RootWindowEventFilter;
 class ScopedCaptureClient;
 }
 
 namespace ash {
 class AshWindowTreeHost;
-class AlwaysOnTopController;
 class DockedWindowLayoutManager;
 enum class LoginStatus;
 class PanelLayoutManager;
 class ShelfLayoutManager;
 class StackingController;
 class StatusAreaWidget;
 class SystemModalContainerLayoutManager;
 class SystemTray;
 class SystemWallpaperController;
 class TouchHudDebug;
@@ skipping 38 matching lines @@
   AshWindowTreeHost* ash_host() { return ash_host_.get(); }
   const AshWindowTreeHost* ash_host() const { return ash_host_.get(); }
 
   aura::WindowTreeHost* GetHost();
   const aura::WindowTreeHost* GetHost() const;
   aura::Window* GetRootWindow();
   const aura::Window* GetRootWindow() const;
 
   WorkspaceController* workspace_controller();
 
-  AlwaysOnTopController* always_on_top_controller() {
-    return always_on_top_controller_.get();
+  WmShelfAura* wm_shelf_aura() const { return wm_shelf_aura_.get(); }
+
+  WmRootWindowControllerAura* wm_root_window_controller() {
+    return wm_root_window_controller_;
   }
 
-  WmShelfAura* wm_shelf_aura() const { return wm_shelf_aura_.get(); }
-
   // Get touch HUDs associated with this root window controller.
   TouchHudDebug* touch_hud_debug() const { return touch_hud_debug_; }
   TouchHudProjection* touch_hud_projection() const {
     return touch_hud_projection_;
   }
 
   // Set touch HUDs for this root window controller. The root window controller
   // will not own the HUDs; their lifetimes are managed by themselves. Whenever
   // the widget showing a HUD is being destroyed (e.g. because of detaching a
   // display), the HUD deletes itself.
@@ skipping 91 matching lines @@
   // Initializes |system_wallpaper_| and possibly also |boot_splash_screen_|.
   // |is_first_run_after_boot| determines the wallpaper's initial color.
   void CreateSystemWallpaper(bool is_first_run_after_boot);
 
   // Enables projection touch HUD.
   void EnableTouchHudProjection();
 
   // Disables projection touch HUD.
   void DisableTouchHudProjection();
 
+  DockedWindowLayoutManager* docked_window_layout_manager();

[James Cook, 2016/09/21 22:03:19]

GetDockedWindowLayoutManager() and GetPanelLayoutManager() please

[sky, 2016/09/21 22:47:49]

Can you motivate that? The style guide says "Functions that are very cheap to
call may instead follow the style for variable names (all lower-case, with
underscores between words)." Ideally I would inline the implementation, but that
would mean having to include wm_root_window_controller.h here, which we try to
avoid in chromium style.

[James Cook, 2016/09/21 22:56:11]

I associate them with inline functions, but I agree that not including
wm_root_window_controller.h is better and the style guide does not mandate that
hacker_style() means inline, so keep them as-is.

+  PanelLayoutManager* panel_layout_manager();
+
   // Overridden from ShellObserver.
   void OnLoginStateChanged(LoginStatus status) override;
   void OnTouchHudProjectionToggled(bool enabled) override;
 
   std::unique_ptr<AshWindowTreeHost> ash_host_;
 
   // Owned by the root window.
   WmRootWindowControllerAura* wm_root_window_controller_ = nullptr;
 
   std::unique_ptr<StackingController> stacking_controller_;
 
   // The shelf controller for this root window. Exists for the entire lifetime
   // of the RootWindowController so that it is safe for observers to be added
   // to it during construction of the shelf widget and status tray.
   std::unique_ptr<WmShelfAura> wm_shelf_aura_;
 
   // An invisible/empty window used as a event target for
   // |MouseCursorEventFilter| before a user logs in.
   // (crbug.com/266987)
   // Its container is |LockScreenWallpaperContainer| and
   // this must be deleted before the container is deleted.
   std::unique_ptr<aura::Window> mouse_event_target_;
 
-  // Manages layout of docked windows. Owned by DockedContainer.
-  DockedWindowLayoutManager* docked_layout_manager_;
-
-  // Manages layout of panels. Owned by PanelContainer.
-  PanelLayoutManager* panel_layout_manager_;
-
   std::unique_ptr<SystemWallpaperController> system_wallpaper_;
 
 #if defined(OS_CHROMEOS)
   std::unique_ptr<BootSplashScreen> boot_splash_screen_;
   // Responsible for initializing TouchExplorationController when spoken
   // feedback is on.
   std::unique_ptr<AshTouchExplorationManager> touch_exploration_manager_;
 #endif
 
-  std::unique_ptr<AlwaysOnTopController> always_on_top_controller_;
-
   // Heads-up displays for touch events. These HUDs are not owned by the root
   // window controller and manage their own lifetimes.
   TouchHudDebug* touch_hud_debug_;
   TouchHudProjection* touch_hud_projection_;
 
   // Handles double clicks on the panel window header.
   std::unique_ptr<ui::EventHandler> panel_container_handler_;
 
   std::unique_ptr<::wm::ScopedCaptureClient> capture_client_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindowController);
 };
 
 // On classic ash, returns the RootWindowController for the given |root_window|.
 // On mus ash, returns the RootWindowController for the primary display.
 // See RootWindowController class comment above.
 ASH_EXPORT RootWindowController* GetRootWindowController(
     const aura::Window* root_window);
 
 }  // namespace ash
 
 #endif  // ASH_ROOT_WINDOW_CONTROLLER_H_