| 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_SHELL_H_ | 5 #ifndef ASH_SHELL_H_ |
| 6 #define ASH_SHELL_H_ | 6 #define ASH_SHELL_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 class WindowCycleController; | 56 class WindowCycleController; |
| 57 | 57 |
| 58 namespace internal { | 58 namespace internal { |
| 59 class ActivationController; | 59 class ActivationController; |
| 60 class AcceleratorFilter; | 60 class AcceleratorFilter; |
| 61 class AppList; | 61 class AppList; |
| 62 class DragDropController; | 62 class DragDropController; |
| 63 class FocusCycler; | 63 class FocusCycler; |
| 64 class InputMethodEventFilter; | 64 class InputMethodEventFilter; |
| 65 class MonitorController; | 65 class MonitorController; |
| 66 class MonitorChangeObserverX11; |
| 66 class PartialScreenshotEventFilter; | 67 class PartialScreenshotEventFilter; |
| 67 class ResizeShadowController; | 68 class ResizeShadowController; |
| 68 class RootWindowEventFilter; | 69 class RootWindowEventFilter; |
| 69 class RootWindowLayoutManager; | 70 class RootWindowLayoutManager; |
| 70 class ShadowController; | 71 class ShadowController; |
| 71 class ShelfLayoutManager; | 72 class ShelfLayoutManager; |
| 72 class StackingController; | 73 class StackingController; |
| 73 class TooltipController; | 74 class TooltipController; |
| 74 class VisibilityController; | 75 class VisibilityController; |
| 75 class WindowModalityController; | 76 class WindowModalityController; |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 241 | 242 |
| 242 // Disables the workspace grid layout. | 243 // Disables the workspace grid layout. |
| 243 void DisableWorkspaceGridLayout(); | 244 void DisableWorkspaceGridLayout(); |
| 244 | 245 |
| 245 static Shell* instance_; | 246 static Shell* instance_; |
| 246 | 247 |
| 247 // If set before the Shell is initialized, the mouse cursor will be hidden | 248 // If set before the Shell is initialized, the mouse cursor will be hidden |
| 248 // when the screen is initially created. | 249 // when the screen is initially created. |
| 249 static bool initially_hide_cursor_; | 250 static bool initially_hide_cursor_; |
| 250 | 251 |
| 252 #if defined(USE_X11) |
| 253 scoped_ptr<internal::MonitorChangeObserverX11> monitor_change_observer_; |
| 254 #endif |
| 255 |
| 251 scoped_ptr<aura::RootWindow> root_window_; | 256 scoped_ptr<aura::RootWindow> root_window_; |
| 252 ScreenAsh* screen_; | 257 ScreenAsh* screen_; |
| 253 | 258 |
| 254 internal::RootWindowEventFilter* root_filter_; // not owned | 259 internal::RootWindowEventFilter* root_filter_; // not owned |
| 255 | 260 |
| 256 std::vector<WindowAndBoundsPair> to_restore_; | 261 std::vector<WindowAndBoundsPair> to_restore_; |
| 257 | 262 |
| 258 #if !defined(OS_MACOSX) | 263 #if !defined(OS_MACOSX) |
| 259 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_; | 264 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_; |
| 260 | 265 |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for | 318 // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for |
| 314 // |status_widget_|). | 319 // |status_widget_|). |
| 315 scoped_ptr<SystemTray> tray_; | 320 scoped_ptr<SystemTray> tray_; |
| 316 | 321 |
| 317 DISALLOW_COPY_AND_ASSIGN(Shell); | 322 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 318 }; | 323 }; |
| 319 | 324 |
| 320 } // namespace ash | 325 } // namespace ash |
| 321 | 326 |
| 322 #endif // ASH_SHELL_H_ | 327 #endif // ASH_SHELL_H_ |
| OLD | NEW |