| 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 namespace internal { | 59 namespace internal { |
| 60 class ActivationController; | 60 class ActivationController; |
| 61 class AcceleratorFilter; | 61 class AcceleratorFilter; |
| 62 class AppList; | 62 class AppList; |
| 63 class DragDropController; | 63 class DragDropController; |
| 64 class EventClientImpl; | 64 class EventClientImpl; |
| 65 class FocusCycler; | 65 class FocusCycler; |
| 66 class InputMethodEventFilter; | 66 class InputMethodEventFilter; |
| 67 class KeyRewriterEventFilter; | 67 class KeyRewriterEventFilter; |
| 68 class MonitorController; | 68 class MonitorController; |
| 69 class PanelLayoutManager; |
| 69 class PartialScreenshotEventFilter; | 70 class PartialScreenshotEventFilter; |
| 70 class ResizeShadowController; | 71 class ResizeShadowController; |
| 71 class RootWindowEventFilter; | 72 class RootWindowEventFilter; |
| 72 class RootWindowLayoutManager; | 73 class RootWindowLayoutManager; |
| 73 class ShadowController; | 74 class ShadowController; |
| 74 class ShelfLayoutManager; | 75 class ShelfLayoutManager; |
| 75 class StackingController; | 76 class StackingController; |
| 76 class TooltipController; | 77 class TooltipController; |
| 77 class VisibilityController; | 78 class VisibilityController; |
| 78 class WindowModalityController; | 79 class WindowModalityController; |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 #endif | 317 #endif |
| 317 | 318 |
| 318 // An event filter that pre-handles all key events to send them to an IME. | 319 // An event filter that pre-handles all key events to send them to an IME. |
| 319 scoped_ptr<internal::InputMethodEventFilter> input_method_filter_; | 320 scoped_ptr<internal::InputMethodEventFilter> input_method_filter_; |
| 320 | 321 |
| 321 // The shelf for managing the launcher and the status widget in non-compact | 322 // The shelf for managing the launcher and the status widget in non-compact |
| 322 // mode. Shell does not own the shelf. Instead, it is owned by container of | 323 // mode. Shell does not own the shelf. Instead, it is owned by container of |
| 323 // the status area. | 324 // the status area. |
| 324 internal::ShelfLayoutManager* shelf_; | 325 internal::ShelfLayoutManager* shelf_; |
| 325 | 326 |
| 327 // Manages layout of panels. Owned by container of panels. |
| 328 internal::PanelLayoutManager* panel_layout_manager_; |
| 329 |
| 326 ObserverList<ShellObserver> observers_; | 330 ObserverList<ShellObserver> observers_; |
| 327 | 331 |
| 328 // Owned by aura::RootWindow, cached here for type safety. | 332 // Owned by aura::RootWindow, cached here for type safety. |
| 329 internal::RootWindowLayoutManager* root_window_layout_; | 333 internal::RootWindowLayoutManager* root_window_layout_; |
| 330 | 334 |
| 331 // Status area with clock, Wi-Fi signal, etc. | 335 // Status area with clock, Wi-Fi signal, etc. |
| 332 views::Widget* status_widget_; | 336 views::Widget* status_widget_; |
| 333 | 337 |
| 334 // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for | 338 // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for |
| 335 // |status_widget_|). | 339 // |status_widget_|). |
| 336 scoped_ptr<SystemTray> tray_; | 340 scoped_ptr<SystemTray> tray_; |
| 337 | 341 |
| 338 DISALLOW_COPY_AND_ASSIGN(Shell); | 342 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 339 }; | 343 }; |
| 340 | 344 |
| 341 } // namespace ash | 345 } // namespace ash |
| 342 | 346 |
| 343 #endif // ASH_SHELL_H_ | 347 #endif // ASH_SHELL_H_ |
| OLD | NEW |