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

Side by Side Diff: ash/shell.cc

Issue 2108403004: mash: Move several chromeos system tray items to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@audio
Patch Set: Rebase Created 4 years, 5 months 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
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 #include <utility> 9 #include <utility>
10 10
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 #include "ui/wm/core/visibility_controller.h" 118 #include "ui/wm/core/visibility_controller.h"
119 #include "ui/wm/core/window_modality_controller.h" 119 #include "ui/wm/core/window_modality_controller.h"
120 120
121 #if defined(OS_CHROMEOS) 121 #if defined(OS_CHROMEOS)
122 #if defined(USE_X11) 122 #if defined(USE_X11)
123 #include "ui/gfx/x/x11_types.h" // nogncheck 123 #include "ui/gfx/x/x11_types.h" // nogncheck
124 #endif // defined(USE_X11) 124 #endif // defined(USE_X11)
125 #include "ash/accelerators/magnifier_key_scroller.h" 125 #include "ash/accelerators/magnifier_key_scroller.h"
126 #include "ash/accelerators/spoken_feedback_toggler.h" 126 #include "ash/accelerators/spoken_feedback_toggler.h"
127 #include "ash/common/ash_constants.h" 127 #include "ash/common/ash_constants.h"
128 #include "ash/common/system/chromeos/bluetooth/bluetooth_notification_controller .h"
128 #include "ash/common/system/chromeos/power/power_status.h" 129 #include "ash/common/system/chromeos/power/power_status.h"
129 #include "ash/display/display_change_observer_chromeos.h" 130 #include "ash/display/display_change_observer_chromeos.h"
130 #include "ash/display/display_color_manager_chromeos.h" 131 #include "ash/display/display_color_manager_chromeos.h"
131 #include "ash/display/display_error_observer_chromeos.h" 132 #include "ash/display/display_error_observer_chromeos.h"
132 #include "ash/display/projecting_observer_chromeos.h" 133 #include "ash/display/projecting_observer_chromeos.h"
133 #include "ash/display/resolution_notification_controller.h" 134 #include "ash/display/resolution_notification_controller.h"
134 #include "ash/display/screen_orientation_controller_chromeos.h" 135 #include "ash/display/screen_orientation_controller_chromeos.h"
135 #include "ash/sticky_keys/sticky_keys_controller.h" 136 #include "ash/sticky_keys/sticky_keys_controller.h"
136 #include "ash/system/chromeos/bluetooth/bluetooth_notification_controller.h"
137 #include "ash/system/chromeos/brightness/brightness_controller_chromeos.h" 137 #include "ash/system/chromeos/brightness/brightness_controller_chromeos.h"
138 #include "ash/system/chromeos/power/power_event_observer.h" 138 #include "ash/system/chromeos/power/power_event_observer.h"
139 #include "ash/system/chromeos/power/video_activity_notifier.h" 139 #include "ash/system/chromeos/power/video_activity_notifier.h"
140 #include "ash/touch/touch_transformer_controller.h" 140 #include "ash/touch/touch_transformer_controller.h"
141 #include "ash/virtual_keyboard_controller.h" 141 #include "ash/virtual_keyboard_controller.h"
142 #include "base/bind_helpers.h" 142 #include "base/bind_helpers.h"
143 #include "base/sys_info.h" 143 #include "base/sys_info.h"
144 #include "chromeos/audio/audio_a11y_controller.h" 144 #include "chromeos/audio/audio_a11y_controller.h"
145 #include "chromeos/dbus/dbus_thread_manager.h" 145 #include "chromeos/dbus/dbus_thread_manager.h"
146 #include "ui/chromeos/user_activity_power_manager_notifier.h" 146 #include "ui/chromeos/user_activity_power_manager_notifier.h"
(...skipping 1028 matching lines...) Expand 10 before | Expand all | Expand 10 after
1175 1175
1176 void Shell::OnWindowActivated( 1176 void Shell::OnWindowActivated(
1177 aura::client::ActivationChangeObserver::ActivationReason reason, 1177 aura::client::ActivationChangeObserver::ActivationReason reason,
1178 aura::Window* gained_active, 1178 aura::Window* gained_active,
1179 aura::Window* lost_active) { 1179 aura::Window* lost_active) {
1180 if (gained_active) 1180 if (gained_active)
1181 target_root_window_ = gained_active->GetRootWindow(); 1181 target_root_window_ = gained_active->GetRootWindow();
1182 } 1182 }
1183 1183
1184 } // namespace ash 1184 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/chromeos/tray_caps_lock.cc ('k') | ash/system/chromeos/bluetooth/bluetooth_notification_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698