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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
133 #include "ash/system/chromeos/brightness/brightness_controller_chromeos.h" | 133 #include "ash/system/chromeos/brightness/brightness_controller_chromeos.h" |
134 #include "ash/system/chromeos/power/power_event_observer.h" | 134 #include "ash/system/chromeos/power/power_event_observer.h" |
135 #include "ash/system/chromeos/power/power_status.h" | 135 #include "ash/system/chromeos/power/power_status.h" |
136 #include "ash/system/chromeos/power/video_activity_notifier.h" | 136 #include "ash/system/chromeos/power/video_activity_notifier.h" |
137 #include "ash/system/chromeos/session/last_window_closed_logout_reminder.h" | 137 #include "ash/system/chromeos/session/last_window_closed_logout_reminder.h" |
138 #include "ash/system/chromeos/session/logout_confirmation_controller.h" | 138 #include "ash/system/chromeos/session/logout_confirmation_controller.h" |
139 #include "ash/touch/touch_transformer_controller.h" | 139 #include "ash/touch/touch_transformer_controller.h" |
140 #include "ash/virtual_keyboard_controller.h" | 140 #include "ash/virtual_keyboard_controller.h" |
141 #include "base/bind_helpers.h" | 141 #include "base/bind_helpers.h" |
142 #include "base/sys_info.h" | 142 #include "base/sys_info.h" |
143 #include "chromeos/audio/audio_a11y_controller.h" | |
143 #include "chromeos/dbus/dbus_thread_manager.h" | 144 #include "chromeos/dbus/dbus_thread_manager.h" |
144 #include "ui/chromeos/user_activity_power_manager_notifier.h" | 145 #include "ui/chromeos/user_activity_power_manager_notifier.h" |
145 #include "ui/display/chromeos/display_configurator.h" | 146 #include "ui/display/chromeos/display_configurator.h" |
146 #endif // defined(OS_CHROMEOS) | 147 #endif // defined(OS_CHROMEOS) |
147 | 148 |
148 namespace ash { | 149 namespace ash { |
149 | 150 |
150 namespace { | 151 namespace { |
151 | 152 |
152 using aura::Window; | 153 using aura::Window; |
(...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
756 | 757 |
757 #if defined(OS_CHROMEOS) | 758 #if defined(OS_CHROMEOS) |
758 // VideoActivityNotifier must be deleted before |video_detector_| is | 759 // VideoActivityNotifier must be deleted before |video_detector_| is |
759 // deleted because it's observing video activity through | 760 // deleted because it's observing video activity through |
760 // VideoDetectorObserver interface. | 761 // VideoDetectorObserver interface. |
761 video_activity_notifier_.reset(); | 762 video_activity_notifier_.reset(); |
762 #endif // defined(OS_CHROMEOS) | 763 #endif // defined(OS_CHROMEOS) |
763 video_detector_.reset(); | 764 video_detector_.reset(); |
764 high_contrast_controller_.reset(); | 765 high_contrast_controller_.reset(); |
765 | 766 |
767 #if defined(OS_CHROMEOS) | |
768 audio_a11y_controller_.reset(); | |
769 #endif // defined(OS_CHROMEOS) | |
oshima
2016/04/11 17:05:30
since you initialized very early on, can you destr
Qiang(Joe) Xu
2016/04/11 20:59:09
Done.
| |
770 | |
766 shadow_controller_.reset(); | 771 shadow_controller_.reset(); |
767 resize_shadow_controller_.reset(); | 772 resize_shadow_controller_.reset(); |
768 | 773 |
769 window_cycle_controller_.reset(); | 774 window_cycle_controller_.reset(); |
770 window_selector_controller_.reset(); | 775 window_selector_controller_.reset(); |
771 | 776 |
772 // |shelf_window_watcher_| has a weak pointer to |shelf_Model_| | 777 // |shelf_window_watcher_| has a weak pointer to |shelf_Model_| |
773 // and has window observers. | 778 // and has window observers. |
774 shelf_window_watcher_.reset(); | 779 shelf_window_watcher_.reset(); |
775 | 780 |
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1086 : init_params.keyboard_factory.Run(); | 1091 : init_params.keyboard_factory.Run(); |
1087 | 1092 |
1088 window_tree_host_manager_->InitHosts(); | 1093 window_tree_host_manager_->InitHosts(); |
1089 | 1094 |
1090 #if defined(OS_CHROMEOS) | 1095 #if defined(OS_CHROMEOS) |
1091 // Needs to be created after InitDisplays() since it may cause the virtual | 1096 // Needs to be created after InitDisplays() since it may cause the virtual |
1092 // keyboard to be deployed. | 1097 // keyboard to be deployed. |
1093 virtual_keyboard_controller_.reset(new VirtualKeyboardController); | 1098 virtual_keyboard_controller_.reset(new VirtualKeyboardController); |
1094 #endif // defined(OS_CHROMEOS) | 1099 #endif // defined(OS_CHROMEOS) |
1095 | 1100 |
1101 #if defined(OS_CHROMEOS) | |
1102 audio_a11y_controller_.reset(new chromeos::AudioA11yController); | |
1103 #endif // defined(OS_CHROMEOS) | |
1104 | |
1096 // It needs to be created after RootWindowController has been created | 1105 // It needs to be created after RootWindowController has been created |
1097 // (which calls OnWindowResized has been called, otherwise the | 1106 // (which calls OnWindowResized has been called, otherwise the |
1098 // widget will not paint when restoring after a browser crash. Also it needs | 1107 // widget will not paint when restoring after a browser crash. Also it needs |
1099 // to be created after InitSecondaryDisplays() to initialize the wallpapers in | 1108 // to be created after InitSecondaryDisplays() to initialize the wallpapers in |
1100 // the correct size. | 1109 // the correct size. |
1101 user_wallpaper_delegate_->InitializeWallpaper(); | 1110 user_wallpaper_delegate_->InitializeWallpaper(); |
1102 | 1111 |
1103 if (cursor_manager_) { | 1112 if (cursor_manager_) { |
1104 if (initially_hide_cursor_) | 1113 if (initially_hide_cursor_) |
1105 cursor_manager_->HideCursor(); | 1114 cursor_manager_->HideCursor(); |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1215 | 1224 |
1216 void Shell::OnWindowActivated( | 1225 void Shell::OnWindowActivated( |
1217 aura::client::ActivationChangeObserver::ActivationReason reason, | 1226 aura::client::ActivationChangeObserver::ActivationReason reason, |
1218 aura::Window* gained_active, | 1227 aura::Window* gained_active, |
1219 aura::Window* lost_active) { | 1228 aura::Window* lost_active) { |
1220 if (gained_active) | 1229 if (gained_active) |
1221 target_root_window_ = gained_active->GetRootWindow(); | 1230 target_root_window_ = gained_active->GetRootWindow(); |
1222 } | 1231 } |
1223 | 1232 |
1224 } // namespace ash | 1233 } // namespace ash |
OLD | NEW |