| 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 11 matching lines...) Expand all Loading... |
| 22 #include "ash/common/keyboard/keyboard_ui.h" | 22 #include "ash/common/keyboard/keyboard_ui.h" |
| 23 #include "ash/common/login_status.h" | 23 #include "ash/common/login_status.h" |
| 24 #include "ash/common/session/session_state_delegate.h" | 24 #include "ash/common/session/session_state_delegate.h" |
| 25 #include "ash/common/shelf/app_list_shelf_item_delegate.h" | 25 #include "ash/common/shelf/app_list_shelf_item_delegate.h" |
| 26 #include "ash/common/shelf/shelf_delegate.h" | 26 #include "ash/common/shelf/shelf_delegate.h" |
| 27 #include "ash/common/shelf/shelf_item_delegate.h" | 27 #include "ash/common/shelf/shelf_item_delegate.h" |
| 28 #include "ash/common/shelf/shelf_model.h" | 28 #include "ash/common/shelf/shelf_model.h" |
| 29 #include "ash/common/shelf/wm_shelf.h" | 29 #include "ash/common/shelf/wm_shelf.h" |
| 30 #include "ash/common/shell_delegate.h" | 30 #include "ash/common/shell_delegate.h" |
| 31 #include "ash/common/system/chromeos/bluetooth/bluetooth_notification_controller
.h" | 31 #include "ash/common/system/chromeos/bluetooth/bluetooth_notification_controller
.h" |
| 32 #include "ash/common/system/chromeos/network/sms_observer.h" |
| 32 #include "ash/common/system/chromeos/power/power_status.h" | 33 #include "ash/common/system/chromeos/power/power_status.h" |
| 33 #include "ash/common/system/status_area_widget.h" | 34 #include "ash/common/system/status_area_widget.h" |
| 34 #include "ash/common/system/tray/system_tray_delegate.h" | 35 #include "ash/common/system/tray/system_tray_delegate.h" |
| 35 #include "ash/common/wallpaper/wallpaper_delegate.h" | 36 #include "ash/common/wallpaper/wallpaper_delegate.h" |
| 36 #include "ash/common/wm/container_finder.h" | 37 #include "ash/common/wm/container_finder.h" |
| 37 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" | 38 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" |
| 38 #include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h" | 39 #include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h" |
| 39 #include "ash/common/wm/mru_window_tracker.h" | 40 #include "ash/common/wm/mru_window_tracker.h" |
| 40 #include "ash/common/wm/root_window_finder.h" | 41 #include "ash/common/wm/root_window_finder.h" |
| 41 #include "ash/common/wm/system_modal_container_layout_manager.h" | 42 #include "ash/common/wm/system_modal_container_layout_manager.h" |
| (...skipping 796 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 838 power_event_observer_.reset(new PowerEventObserver()); | 839 power_event_observer_.reset(new PowerEventObserver()); |
| 839 user_activity_notifier_.reset( | 840 user_activity_notifier_.reset( |
| 840 new ui::UserActivityPowerManagerNotifier(user_activity_detector_.get())); | 841 new ui::UserActivityPowerManagerNotifier(user_activity_detector_.get())); |
| 841 video_activity_notifier_.reset( | 842 video_activity_notifier_.reset( |
| 842 new VideoActivityNotifier(video_detector_.get())); | 843 new VideoActivityNotifier(video_detector_.get())); |
| 843 bluetooth_notification_controller_.reset(new BluetoothNotificationController); | 844 bluetooth_notification_controller_.reset(new BluetoothNotificationController); |
| 844 if (!is_mash) { | 845 if (!is_mash) { |
| 845 screen_orientation_controller_.reset(new ScreenOrientationController()); | 846 screen_orientation_controller_.reset(new ScreenOrientationController()); |
| 846 screen_layout_observer_.reset(new ScreenLayoutObserver()); | 847 screen_layout_observer_.reset(new ScreenLayoutObserver()); |
| 847 } | 848 } |
| 849 sms_observer_.reset(new SmsObserver()); |
| 848 | 850 |
| 849 // The compositor thread and main message loop have to be running in | 851 // The compositor thread and main message loop have to be running in |
| 850 // order to create mirror window. Run it after the main message loop | 852 // order to create mirror window. Run it after the main message loop |
| 851 // is started. | 853 // is started. |
| 852 if (!is_mash) | 854 if (!is_mash) |
| 853 display_manager_->CreateMirrorWindowAsyncIfAny(); | 855 display_manager_->CreateMirrorWindowAsyncIfAny(); |
| 854 | 856 |
| 855 for (auto& observer : *wm_shell_->shell_observers()) | 857 for (auto& observer : *wm_shell_->shell_observers()) |
| 856 observer.OnShellInitialized(); | 858 observer.OnShellInitialized(); |
| 857 | 859 |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 938 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { | 940 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { |
| 939 return std::unique_ptr<ui::EventTargetIterator>(); | 941 return std::unique_ptr<ui::EventTargetIterator>(); |
| 940 } | 942 } |
| 941 | 943 |
| 942 ui::EventTargeter* Shell::GetEventTargeter() { | 944 ui::EventTargeter* Shell::GetEventTargeter() { |
| 943 NOTREACHED(); | 945 NOTREACHED(); |
| 944 return nullptr; | 946 return nullptr; |
| 945 } | 947 } |
| 946 | 948 |
| 947 } // namespace ash | 949 } // namespace ash |
| OLD | NEW |