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 PanelLayoutManager; |
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 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
295 #if !defined(OS_MACOSX) | 296 #if !defined(OS_MACOSX) |
296 // An event filter that pre-handles global accelerators. | 297 // An event filter that pre-handles global accelerators. |
297 scoped_ptr<internal::AcceleratorFilter> accelerator_filter_; | 298 scoped_ptr<internal::AcceleratorFilter> accelerator_filter_; |
298 #endif | 299 #endif |
299 | 300 |
300 // The shelf for managing the launcher and the status widget in non-compact | 301 // The shelf for managing the launcher and the status widget in non-compact |
301 // mode. Shell does not own the shelf. Instead, it is owned by container of | 302 // mode. Shell does not own the shelf. Instead, it is owned by container of |
302 // the status area. | 303 // the status area. |
303 internal::ShelfLayoutManager* shelf_; | 304 internal::ShelfLayoutManager* shelf_; |
304 | 305 |
| 306 // Manages layout of panels. Owned by container of panels. |
| 307 internal::PanelLayoutManager* panel_layout_manager_; |
| 308 |
305 ObserverList<ShellObserver> observers_; | 309 ObserverList<ShellObserver> observers_; |
306 | 310 |
307 // Owned by aura::RootWindow, cached here for type safety. | 311 // Owned by aura::RootWindow, cached here for type safety. |
308 internal::RootWindowLayoutManager* root_window_layout_; | 312 internal::RootWindowLayoutManager* root_window_layout_; |
309 | 313 |
310 // Status area with clock, Wi-Fi signal, etc. | 314 // Status area with clock, Wi-Fi signal, etc. |
311 views::Widget* status_widget_; | 315 views::Widget* status_widget_; |
312 | 316 |
313 // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for | 317 // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for |
314 // |status_widget_|). | 318 // |status_widget_|). |
315 scoped_ptr<SystemTray> tray_; | 319 scoped_ptr<SystemTray> tray_; |
316 | 320 |
317 DISALLOW_COPY_AND_ASSIGN(Shell); | 321 DISALLOW_COPY_AND_ASSIGN(Shell); |
318 }; | 322 }; |
319 | 323 |
320 } // namespace ash | 324 } // namespace ash |
321 | 325 |
322 #endif // ASH_SHELL_H_ | 326 #endif // ASH_SHELL_H_ |
OLD | NEW |