Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| (...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 276 DockedWindowLayoutManager* docked_layout_manager_; | 276 DockedWindowLayoutManager* docked_layout_manager_; |
| 277 | 277 |
| 278 // Manages layout of panels. Owned by PanelContainer. | 278 // Manages layout of panels. Owned by PanelContainer. |
| 279 PanelLayoutManager* panel_layout_manager_; | 279 PanelLayoutManager* panel_layout_manager_; |
| 280 | 280 |
| 281 scoped_ptr<SystemBackgroundController> system_background_; | 281 scoped_ptr<SystemBackgroundController> system_background_; |
| 282 #if defined(OS_CHROMEOS) | 282 #if defined(OS_CHROMEOS) |
| 283 scoped_ptr<BootSplashScreen> boot_splash_screen_; | 283 scoped_ptr<BootSplashScreen> boot_splash_screen_; |
| 284 #endif | 284 #endif |
| 285 | 285 |
| 286 RootWindowType root_window_type_; | |
|
oshima
2013/10/30 21:05:30
you don't need this with my patch.
bshe
2013/10/31 16:45:44
Done.
| |
| 287 | |
| 286 scoped_ptr<ScreenDimmer> screen_dimmer_; | 288 scoped_ptr<ScreenDimmer> screen_dimmer_; |
| 287 scoped_ptr<WorkspaceController> workspace_controller_; | 289 scoped_ptr<WorkspaceController> workspace_controller_; |
| 288 scoped_ptr<AlwaysOnTopController> always_on_top_controller_; | 290 scoped_ptr<AlwaysOnTopController> always_on_top_controller_; |
| 289 | 291 |
| 290 // Heads-up displays for touch events. These HUDs are not owned by the root | 292 // Heads-up displays for touch events. These HUDs are not owned by the root |
| 291 // window controller and manage their own lifetimes. | 293 // window controller and manage their own lifetimes. |
| 292 TouchHudDebug* touch_hud_debug_; | 294 TouchHudDebug* touch_hud_debug_; |
| 293 TouchHudProjection* touch_hud_projection_; | 295 TouchHudProjection* touch_hud_projection_; |
| 294 | 296 |
| 295 // We need to own event handlers for various containers. | 297 // We need to own event handlers for various containers. |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 309 | 311 |
| 310 | 312 |
| 311 // Gets the RootWindowController for |root_window|. | 313 // Gets the RootWindowController for |root_window|. |
| 312 ASH_EXPORT RootWindowController* GetRootWindowController( | 314 ASH_EXPORT RootWindowController* GetRootWindowController( |
| 313 const aura::Window* root_window); | 315 const aura::Window* root_window); |
| 314 | 316 |
| 315 } // namespace internal | 317 } // namespace internal |
| 316 } // ash | 318 } // ash |
| 317 | 319 |
| 318 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_ | 320 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_ |
| OLD | NEW |