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

Side by Side Diff: ash/shell.cc

Issue 2061823002: mash: Move ash constants and layout constants files to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@trayimageitem
Patch Set: rebase Created 4 years, 6 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
« no previous file with comments | « ash/shelf/shelf_view.cc ('k') | ash/system/audio/tray_audio.cc » ('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 #include <utility> 9 #include <utility>
10 10
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 #include "ui/wm/core/shadow_controller.h" 120 #include "ui/wm/core/shadow_controller.h"
121 #include "ui/wm/core/visibility_controller.h" 121 #include "ui/wm/core/visibility_controller.h"
122 #include "ui/wm/core/window_modality_controller.h" 122 #include "ui/wm/core/window_modality_controller.h"
123 123
124 #if defined(OS_CHROMEOS) 124 #if defined(OS_CHROMEOS)
125 #if defined(USE_X11) 125 #if defined(USE_X11)
126 #include "ui/gfx/x/x11_types.h" // nogncheck 126 #include "ui/gfx/x/x11_types.h" // nogncheck
127 #endif // defined(USE_X11) 127 #endif // defined(USE_X11)
128 #include "ash/accelerators/magnifier_key_scroller.h" 128 #include "ash/accelerators/magnifier_key_scroller.h"
129 #include "ash/accelerators/spoken_feedback_toggler.h" 129 #include "ash/accelerators/spoken_feedback_toggler.h"
130 #include "ash/ash_constants.h" 130 #include "ash/common/ash_constants.h"
131 #include "ash/display/display_change_observer_chromeos.h" 131 #include "ash/display/display_change_observer_chromeos.h"
132 #include "ash/display/display_color_manager_chromeos.h" 132 #include "ash/display/display_color_manager_chromeos.h"
133 #include "ash/display/display_error_observer_chromeos.h" 133 #include "ash/display/display_error_observer_chromeos.h"
134 #include "ash/display/projecting_observer_chromeos.h" 134 #include "ash/display/projecting_observer_chromeos.h"
135 #include "ash/display/resolution_notification_controller.h" 135 #include "ash/display/resolution_notification_controller.h"
136 #include "ash/display/screen_orientation_controller_chromeos.h" 136 #include "ash/display/screen_orientation_controller_chromeos.h"
137 #include "ash/sticky_keys/sticky_keys_controller.h" 137 #include "ash/sticky_keys/sticky_keys_controller.h"
138 #include "ash/system/chromeos/bluetooth/bluetooth_notification_controller.h" 138 #include "ash/system/chromeos/bluetooth/bluetooth_notification_controller.h"
139 #include "ash/system/chromeos/brightness/brightness_controller_chromeos.h" 139 #include "ash/system/chromeos/brightness/brightness_controller_chromeos.h"
140 #include "ash/system/chromeos/power/power_event_observer.h" 140 #include "ash/system/chromeos/power/power_event_observer.h"
(...skipping 1102 matching lines...) Expand 10 before | Expand all | Expand 10 after
1243 1243
1244 void Shell::OnWindowActivated( 1244 void Shell::OnWindowActivated(
1245 aura::client::ActivationChangeObserver::ActivationReason reason, 1245 aura::client::ActivationChangeObserver::ActivationReason reason,
1246 aura::Window* gained_active, 1246 aura::Window* gained_active,
1247 aura::Window* lost_active) { 1247 aura::Window* lost_active) {
1248 if (gained_active) 1248 if (gained_active)
1249 target_root_window_ = gained_active->GetRootWindow(); 1249 target_root_window_ = gained_active->GetRootWindow();
1250 } 1250 }
1251 1251
1252 } // namespace ash 1252 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_view.cc ('k') | ash/system/audio/tray_audio.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698