Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(459)

Side by Side Diff: ash/root_window_controller.h

Issue 2292183003: Moves WorkspaceController to ash/common (Closed)
Patch Set: merge 2 trunk Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_ROOT_WINDOW_CONTROLLER_H_ 5 #ifndef ASH_ROOT_WINDOW_CONTROLLER_H_
6 #define ASH_ROOT_WINDOW_CONTROLLER_H_ 6 #define ASH_ROOT_WINDOW_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 ~RootWindowController() override; 104 ~RootWindowController() override;
105 105
106 AshWindowTreeHost* ash_host() { return ash_host_.get(); } 106 AshWindowTreeHost* ash_host() { return ash_host_.get(); }
107 const AshWindowTreeHost* ash_host() const { return ash_host_.get(); } 107 const AshWindowTreeHost* ash_host() const { return ash_host_.get(); }
108 108
109 aura::WindowTreeHost* GetHost(); 109 aura::WindowTreeHost* GetHost();
110 const aura::WindowTreeHost* GetHost() const; 110 const aura::WindowTreeHost* GetHost() const;
111 aura::Window* GetRootWindow(); 111 aura::Window* GetRootWindow();
112 const aura::Window* GetRootWindow() const; 112 const aura::Window* GetRootWindow() const;
113 113
114 WorkspaceController* workspace_controller() { 114 WorkspaceController* workspace_controller();
115 return workspace_controller_.get();
116 }
117 115
118 AlwaysOnTopController* always_on_top_controller() { 116 AlwaysOnTopController* always_on_top_controller() {
119 return always_on_top_controller_.get(); 117 return always_on_top_controller_.get();
120 } 118 }
121 119
122 WmShelfAura* wm_shelf_aura() const { return wm_shelf_aura_.get(); } 120 WmShelfAura* wm_shelf_aura() const { return wm_shelf_aura_.get(); }
123 121
124 // Access the shelf widget associated with this root window controller, 122 // Access the shelf widget associated with this root window controller,
125 // NULL if no such shelf exists. 123 // NULL if no such shelf exists.
126 // DEPRECATED: Prefer GetShelf()->shelf_widget(). 124 // DEPRECATED: Prefer GetShelf()->shelf_widget().
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 300
303 std::unique_ptr<SystemWallpaperController> system_wallpaper_; 301 std::unique_ptr<SystemWallpaperController> system_wallpaper_;
304 302
305 #if defined(OS_CHROMEOS) 303 #if defined(OS_CHROMEOS)
306 std::unique_ptr<BootSplashScreen> boot_splash_screen_; 304 std::unique_ptr<BootSplashScreen> boot_splash_screen_;
307 // Responsible for initializing TouchExplorationController when spoken 305 // Responsible for initializing TouchExplorationController when spoken
308 // feedback is on. 306 // feedback is on.
309 std::unique_ptr<AshTouchExplorationManager> touch_exploration_manager_; 307 std::unique_ptr<AshTouchExplorationManager> touch_exploration_manager_;
310 #endif 308 #endif
311 309
312 std::unique_ptr<WorkspaceController> workspace_controller_;
313 std::unique_ptr<AlwaysOnTopController> always_on_top_controller_; 310 std::unique_ptr<AlwaysOnTopController> always_on_top_controller_;
314 311
315 // Heads-up displays for touch events. These HUDs are not owned by the root 312 // Heads-up displays for touch events. These HUDs are not owned by the root
316 // window controller and manage their own lifetimes. 313 // window controller and manage their own lifetimes.
317 TouchHudDebug* touch_hud_debug_; 314 TouchHudDebug* touch_hud_debug_;
318 TouchHudProjection* touch_hud_projection_; 315 TouchHudProjection* touch_hud_projection_;
319 316
320 // Handles double clicks on the panel window header. 317 // Handles double clicks on the panel window header.
321 std::unique_ptr<ui::EventHandler> panel_container_handler_; 318 std::unique_ptr<ui::EventHandler> panel_container_handler_;
322 319
(...skipping 12 matching lines...) Expand all
335 332
336 // On classic ash, returns the RootWindowController for the given |root_window|. 333 // On classic ash, returns the RootWindowController for the given |root_window|.
337 // On mus ash, returns the RootWindowController for the primary display. 334 // On mus ash, returns the RootWindowController for the primary display.
338 // See RootWindowController class comment above. 335 // See RootWindowController class comment above.
339 ASH_EXPORT RootWindowController* GetRootWindowController( 336 ASH_EXPORT RootWindowController* GetRootWindowController(
340 const aura::Window* root_window); 337 const aura::Window* root_window);
341 338
342 } // namespace ash 339 } // namespace ash
343 340
344 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_ 341 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698