Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(511)

Side by Side Diff: ash/shell.cc

Issue 648733003: Implement ScreenOrientationDelegate on ChromeOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/shell.h ('k') | ash/wm/maximize_mode/maximize_mode_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 9
10 #include "ash/accelerators/accelerator_controller.h" 10 #include "ash/accelerators/accelerator_controller.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 #include "ui/wm/core/visibility_controller.h" 114 #include "ui/wm/core/visibility_controller.h"
115 #include "ui/wm/core/window_modality_controller.h" 115 #include "ui/wm/core/window_modality_controller.h"
116 116
117 #if defined(OS_CHROMEOS) 117 #if defined(OS_CHROMEOS)
118 #if defined(USE_X11) 118 #if defined(USE_X11)
119 #include "ash/accelerators/magnifier_key_scroller.h" 119 #include "ash/accelerators/magnifier_key_scroller.h"
120 #include "ash/accelerators/spoken_feedback_toggler.h" 120 #include "ash/accelerators/spoken_feedback_toggler.h"
121 #include "ui/gfx/x/x11_types.h" 121 #include "ui/gfx/x/x11_types.h"
122 #endif // defined(USE_X11) 122 #endif // defined(USE_X11)
123 #include "ash/ash_constants.h" 123 #include "ash/ash_constants.h"
124 #include "ash/content/display/screen_orientation_delegate_chromeos.h"
124 #include "ash/display/display_change_observer_chromeos.h" 125 #include "ash/display/display_change_observer_chromeos.h"
125 #include "ash/display/display_configurator_animation.h" 126 #include "ash/display/display_configurator_animation.h"
126 #include "ash/display/display_error_observer_chromeos.h" 127 #include "ash/display/display_error_observer_chromeos.h"
127 #include "ash/display/projecting_observer_chromeos.h" 128 #include "ash/display/projecting_observer_chromeos.h"
128 #include "ash/display/resolution_notification_controller.h" 129 #include "ash/display/resolution_notification_controller.h"
129 #include "ash/sticky_keys/sticky_keys_controller.h" 130 #include "ash/sticky_keys/sticky_keys_controller.h"
130 #include "ash/system/chromeos/bluetooth/bluetooth_notification_controller.h" 131 #include "ash/system/chromeos/bluetooth/bluetooth_notification_controller.h"
131 #include "ash/system/chromeos/brightness/brightness_controller_chromeos.h" 132 #include "ash/system/chromeos/brightness/brightness_controller_chromeos.h"
132 #include "ash/system/chromeos/power/power_event_observer.h" 133 #include "ash/system/chromeos/power/power_event_observer.h"
133 #include "ash/system/chromeos/power/power_status.h" 134 #include "ash/system/chromeos/power/power_status.h"
(...skipping 919 matching lines...) Expand 10 before | Expand all | Expand 10 after
1053 scoped_ptr<ash::BrightnessControlDelegate>( 1054 scoped_ptr<ash::BrightnessControlDelegate>(
1054 new ash::system::BrightnessControllerChromeos).Pass()); 1055 new ash::system::BrightnessControllerChromeos).Pass());
1055 1056
1056 power_event_observer_.reset(new PowerEventObserver()); 1057 power_event_observer_.reset(new PowerEventObserver());
1057 user_activity_notifier_.reset( 1058 user_activity_notifier_.reset(
1058 new ui::UserActivityPowerManagerNotifier(user_activity_detector_.get())); 1059 new ui::UserActivityPowerManagerNotifier(user_activity_detector_.get()));
1059 video_activity_notifier_.reset( 1060 video_activity_notifier_.reset(
1060 new VideoActivityNotifier(video_detector_.get())); 1061 new VideoActivityNotifier(video_detector_.get()));
1061 bluetooth_notification_controller_.reset(new BluetoothNotificationController); 1062 bluetooth_notification_controller_.reset(new BluetoothNotificationController);
1062 last_window_closed_logout_reminder_.reset(new LastWindowClosedLogoutReminder); 1063 last_window_closed_logout_reminder_.reset(new LastWindowClosedLogoutReminder);
1064 screen_orientation_delegate_.reset(new ScreenOrientationDelegate());
1063 #endif 1065 #endif
1064 1066
1065 weak_display_manager_factory_.reset( 1067 weak_display_manager_factory_.reset(
1066 new base::WeakPtrFactory<DisplayManager>(display_manager_.get())); 1068 new base::WeakPtrFactory<DisplayManager>(display_manager_.get()));
1067 // The compositor thread and main message loop have to be running in 1069 // The compositor thread and main message loop have to be running in
1068 // order to create mirror window. Run it after the main message loop 1070 // order to create mirror window. Run it after the main message loop
1069 // is started. 1071 // is started.
1070 base::MessageLoopForUI::current()->PostTask( 1072 base::MessageLoopForUI::current()->PostTask(
1071 FROM_HERE, 1073 FROM_HERE,
1072 base::Bind(&DisplayManager::CreateMirrorWindowIfAny, 1074 base::Bind(&DisplayManager::CreateMirrorWindowIfAny,
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
1163 //////////////////////////////////////////////////////////////////////////////// 1165 ////////////////////////////////////////////////////////////////////////////////
1164 // Shell, aura::client::ActivationChangeObserver implementation: 1166 // Shell, aura::client::ActivationChangeObserver implementation:
1165 1167
1166 void Shell::OnWindowActivated(aura::Window* gained_active, 1168 void Shell::OnWindowActivated(aura::Window* gained_active,
1167 aura::Window* lost_active) { 1169 aura::Window* lost_active) {
1168 if (gained_active) 1170 if (gained_active)
1169 target_root_window_ = gained_active->GetRootWindow(); 1171 target_root_window_ = gained_active->GetRootWindow();
1170 } 1172 }
1171 1173
1172 } // namespace ash 1174 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.h ('k') | ash/wm/maximize_mode/maximize_mode_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698