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 #include "ash/shell.h" | 5 #include "ash/shell.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 #include "ash/display/window_tree_host_manager.h" | 48 #include "ash/display/window_tree_host_manager.h" |
49 #include "ash/drag_drop/drag_drop_controller.h" | 49 #include "ash/drag_drop/drag_drop_controller.h" |
50 #include "ash/first_run/first_run_helper_impl.h" | 50 #include "ash/first_run/first_run_helper_impl.h" |
51 #include "ash/high_contrast/high_contrast_controller.h" | 51 #include "ash/high_contrast/high_contrast_controller.h" |
52 #include "ash/host/ash_window_tree_host_init_params.h" | 52 #include "ash/host/ash_window_tree_host_init_params.h" |
53 #include "ash/ime/input_method_event_handler.h" | 53 #include "ash/ime/input_method_event_handler.h" |
54 #include "ash/magnifier/magnification_controller.h" | 54 #include "ash/magnifier/magnification_controller.h" |
55 #include "ash/magnifier/partial_magnification_controller.h" | 55 #include "ash/magnifier/partial_magnification_controller.h" |
56 #include "ash/root_window_controller.h" | 56 #include "ash/root_window_controller.h" |
57 #include "ash/shell_init_params.h" | 57 #include "ash/shell_init_params.h" |
| 58 #include "ash/system/chromeos/screen_layout_observer.h" |
58 #include "ash/utility/screenshot_controller.h" | 59 #include "ash/utility/screenshot_controller.h" |
59 #include "ash/wallpaper/wallpaper_controller.h" | 60 #include "ash/wallpaper/wallpaper_controller.h" |
60 #include "ash/wallpaper/wallpaper_view.h" | 61 #include "ash/wallpaper/wallpaper_view.h" |
61 #include "ash/wm/ash_focus_rules.h" | 62 #include "ash/wm/ash_focus_rules.h" |
62 #include "ash/wm/ash_native_cursor_manager.h" | 63 #include "ash/wm/ash_native_cursor_manager.h" |
63 #include "ash/wm/event_client_impl.h" | 64 #include "ash/wm/event_client_impl.h" |
64 #include "ash/wm/immersive_handler_factory_ash.h" | 65 #include "ash/wm/immersive_handler_factory_ash.h" |
65 #include "ash/wm/lock_state_controller.h" | 66 #include "ash/wm/lock_state_controller.h" |
66 #include "ash/wm/overlay_event_filter.h" | 67 #include "ash/wm/overlay_event_filter.h" |
67 #include "ash/wm/overview/scoped_overview_animation_settings_factory_aura.h" | 68 #include "ash/wm/overview/scoped_overview_animation_settings_factory_aura.h" |
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
542 #if defined(OS_CHROMEOS) | 543 #if defined(OS_CHROMEOS) |
543 RemovePreTargetHandler(stylus_metrics_recorder_.get()); | 544 RemovePreTargetHandler(stylus_metrics_recorder_.get()); |
544 #endif | 545 #endif |
545 RemovePreTargetHandler(modality_filter_.get()); | 546 RemovePreTargetHandler(modality_filter_.get()); |
546 | 547 |
547 // TooltipController is deleted with the Shell so removing its references. | 548 // TooltipController is deleted with the Shell so removing its references. |
548 RemovePreTargetHandler(tooltip_controller_.get()); | 549 RemovePreTargetHandler(tooltip_controller_.get()); |
549 | 550 |
550 #if defined(OS_CHROMEOS) | 551 #if defined(OS_CHROMEOS) |
551 screen_orientation_controller_.reset(); | 552 screen_orientation_controller_.reset(); |
| 553 screen_layout_observer_.reset(); |
552 #endif | 554 #endif |
553 | 555 |
554 // Destroy the virtual keyboard controller before the maximize mode controller | 556 // Destroy the virtual keyboard controller before the maximize mode controller |
555 // since the latters destructor triggers events that the former is listening | 557 // since the latters destructor triggers events that the former is listening |
556 // to but no longer cares about. | 558 // to but no longer cares about. |
557 #if defined(OS_CHROMEOS) | 559 #if defined(OS_CHROMEOS) |
558 virtual_keyboard_controller_.reset(); | 560 virtual_keyboard_controller_.reset(); |
559 #endif | 561 #endif |
560 | 562 |
561 // Destroy maximize mode controller early on since it has some observers which | 563 // Destroy maximize mode controller early on since it has some observers which |
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
937 } | 939 } |
938 | 940 |
939 #if defined(OS_CHROMEOS) | 941 #if defined(OS_CHROMEOS) |
940 power_event_observer_.reset(new PowerEventObserver()); | 942 power_event_observer_.reset(new PowerEventObserver()); |
941 user_activity_notifier_.reset( | 943 user_activity_notifier_.reset( |
942 new ui::UserActivityPowerManagerNotifier(user_activity_detector_.get())); | 944 new ui::UserActivityPowerManagerNotifier(user_activity_detector_.get())); |
943 video_activity_notifier_.reset( | 945 video_activity_notifier_.reset( |
944 new VideoActivityNotifier(video_detector_.get())); | 946 new VideoActivityNotifier(video_detector_.get())); |
945 bluetooth_notification_controller_.reset(new BluetoothNotificationController); | 947 bluetooth_notification_controller_.reset(new BluetoothNotificationController); |
946 screen_orientation_controller_.reset(new ScreenOrientationController()); | 948 screen_orientation_controller_.reset(new ScreenOrientationController()); |
| 949 screen_layout_observer_.reset(new ScreenLayoutObserver()); |
947 #endif | 950 #endif |
948 // The compositor thread and main message loop have to be running in | 951 // The compositor thread and main message loop have to be running in |
949 // order to create mirror window. Run it after the main message loop | 952 // order to create mirror window. Run it after the main message loop |
950 // is started. | 953 // is started. |
951 display_manager_->CreateMirrorWindowAsyncIfAny(); | 954 display_manager_->CreateMirrorWindowAsyncIfAny(); |
952 | 955 |
953 FOR_EACH_OBSERVER(ShellObserver, *wm_shell_->shell_observers(), | 956 FOR_EACH_OBSERVER(ShellObserver, *wm_shell_->shell_observers(), |
954 OnShellInitialized()); | 957 OnShellInitialized()); |
955 | 958 |
956 user_metrics_recorder_->OnShellInitialized(); | 959 user_metrics_recorder_->OnShellInitialized(); |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1022 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { | 1025 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { |
1023 return std::unique_ptr<ui::EventTargetIterator>(); | 1026 return std::unique_ptr<ui::EventTargetIterator>(); |
1024 } | 1027 } |
1025 | 1028 |
1026 ui::EventTargeter* Shell::GetEventTargeter() { | 1029 ui::EventTargeter* Shell::GetEventTargeter() { |
1027 NOTREACHED(); | 1030 NOTREACHED(); |
1028 return nullptr; | 1031 return nullptr; |
1029 } | 1032 } |
1030 | 1033 |
1031 } // namespace ash | 1034 } // namespace ash |
OLD | NEW |