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 | 7 |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "ash/ash_export.h" | 11 #include "ash/ash_export.h" |
| 12 #include "ash/periodic_metrics_recorder.h" |
12 #include "ash/shelf/shelf_types.h" | 13 #include "ash/shelf/shelf_types.h" |
13 #include "ash/system/user/login_status.h" | 14 #include "ash/system/user/login_status.h" |
14 #include "ash/wm/system_modal_container_event_filter_delegate.h" | 15 #include "ash/wm/system_modal_container_event_filter_delegate.h" |
15 #include "base/basictypes.h" | 16 #include "base/basictypes.h" |
16 #include "base/compiler_specific.h" | 17 #include "base/compiler_specific.h" |
17 #include "base/gtest_prod_util.h" | 18 #include "base/gtest_prod_util.h" |
18 #include "base/memory/scoped_ptr.h" | 19 #include "base/memory/scoped_ptr.h" |
19 #include "base/memory/weak_ptr.h" | 20 #include "base/memory/weak_ptr.h" |
20 #include "base/observer_list.h" | 21 #include "base/observer_list.h" |
21 #include "ui/aura/client/activation_change_observer.h" | 22 #include "ui/aura/client/activation_change_observer.h" |
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
568 // which case they are created on |target_root_window_|. | 569 // which case they are created on |target_root_window_|. |
569 // |target_root_window_| never becomes NULL during the session. | 570 // |target_root_window_| never becomes NULL during the session. |
570 aura::Window* target_root_window_; | 571 aura::Window* target_root_window_; |
571 aura::Window* scoped_target_root_window_; | 572 aura::Window* scoped_target_root_window_; |
572 | 573 |
573 // The CompoundEventFilter owned by aura::Env object. | 574 // The CompoundEventFilter owned by aura::Env object. |
574 scoped_ptr<views::corewm::CompoundEventFilter> env_filter_; | 575 scoped_ptr<views::corewm::CompoundEventFilter> env_filter_; |
575 | 576 |
576 std::vector<WindowAndBoundsPair> to_restore_; | 577 std::vector<WindowAndBoundsPair> to_restore_; |
577 | 578 |
| 579 scoped_ptr<AshPeriodicMetricsRecorder> periodic_metrics_recorder_; |
578 scoped_ptr<keyboard::KeyboardController> keyboard_controller_; | 580 scoped_ptr<keyboard::KeyboardController> keyboard_controller_; |
579 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_; | 581 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_; |
580 scoped_ptr<AcceleratorController> accelerator_controller_; | 582 scoped_ptr<AcceleratorController> accelerator_controller_; |
581 scoped_ptr<ShellDelegate> delegate_; | 583 scoped_ptr<ShellDelegate> delegate_; |
582 scoped_ptr<SystemTrayDelegate> system_tray_delegate_; | 584 scoped_ptr<SystemTrayDelegate> system_tray_delegate_; |
583 scoped_ptr<SystemTrayNotifier> system_tray_notifier_; | 585 scoped_ptr<SystemTrayNotifier> system_tray_notifier_; |
584 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; | 586 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; |
585 scoped_ptr<CapsLockDelegate> caps_lock_delegate_; | 587 scoped_ptr<CapsLockDelegate> caps_lock_delegate_; |
586 scoped_ptr<SessionStateDelegate> session_state_delegate_; | 588 scoped_ptr<SessionStateDelegate> session_state_delegate_; |
587 scoped_ptr<AccessibilityDelegate> accessibility_delegate_; | 589 scoped_ptr<AccessibilityDelegate> accessibility_delegate_; |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
685 bool simulate_modal_window_open_for_testing_; | 687 bool simulate_modal_window_open_for_testing_; |
686 | 688 |
687 bool is_touch_hud_projection_enabled_; | 689 bool is_touch_hud_projection_enabled_; |
688 | 690 |
689 DISALLOW_COPY_AND_ASSIGN(Shell); | 691 DISALLOW_COPY_AND_ASSIGN(Shell); |
690 }; | 692 }; |
691 | 693 |
692 } // namespace ash | 694 } // namespace ash |
693 | 695 |
694 #endif // ASH_SHELL_H_ | 696 #endif // ASH_SHELL_H_ |
OLD | NEW |