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

Side by Side Diff: ash/shell.cc

Issue 2099793002: mash: Migrate some system user files to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup 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
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
11 #include "ash/accelerators/accelerator_controller.h" 11 #include "ash/accelerators/accelerator_controller.h"
12 #include "ash/accelerators/accelerator_delegate.h" 12 #include "ash/accelerators/accelerator_delegate.h"
13 #include "ash/accelerators/focus_manager_factory.h" 13 #include "ash/accelerators/focus_manager_factory.h"
14 #include "ash/aura/wm_shell_aura.h" 14 #include "ash/aura/wm_shell_aura.h"
15 #include "ash/aura/wm_window_aura.h" 15 #include "ash/aura/wm_window_aura.h"
16 #include "ash/autoclick/autoclick_controller.h" 16 #include "ash/autoclick/autoclick_controller.h"
17 #include "ash/common/accessibility_delegate.h" 17 #include "ash/common/accessibility_delegate.h"
18 #include "ash/common/ash_switches.h" 18 #include "ash/common/ash_switches.h"
19 #include "ash/common/keyboard/keyboard_ui.h" 19 #include "ash/common/keyboard/keyboard_ui.h"
20 #include "ash/common/login_status.h"
20 #include "ash/common/session/session_state_delegate.h" 21 #include "ash/common/session/session_state_delegate.h"
21 #include "ash/common/shelf/shelf_item_delegate.h" 22 #include "ash/common/shelf/shelf_item_delegate.h"
22 #include "ash/common/shelf/shelf_item_delegate_manager.h" 23 #include "ash/common/shelf/shelf_item_delegate_manager.h"
23 #include "ash/common/shelf/shelf_model.h" 24 #include "ash/common/shelf/shelf_model.h"
24 #include "ash/common/shell_window_ids.h" 25 #include "ash/common/shell_window_ids.h"
25 #include "ash/common/system/locale/locale_notification_controller.h" 26 #include "ash/common/system/locale/locale_notification_controller.h"
26 #include "ash/common/system/tray/system_tray_delegate.h" 27 #include "ash/common/system/tray/system_tray_delegate.h"
27 #include "ash/common/wm/mru_window_tracker.h" 28 #include "ash/common/wm/mru_window_tracker.h"
28 #include "ash/common/wm/root_window_finder.h" 29 #include "ash/common/wm/root_window_finder.h"
29 #include "ash/common/wm/window_positioner.h" 30 #include "ash/common/wm/window_positioner.h"
(...skipping 1180 matching lines...) Expand 10 before | Expand all | Expand 10 after
1210 1211
1211 void Shell::OnWindowActivated( 1212 void Shell::OnWindowActivated(
1212 aura::client::ActivationChangeObserver::ActivationReason reason, 1213 aura::client::ActivationChangeObserver::ActivationReason reason,
1213 aura::Window* gained_active, 1214 aura::Window* gained_active,
1214 aura::Window* lost_active) { 1215 aura::Window* lost_active) {
1215 if (gained_active) 1216 if (gained_active)
1216 target_root_window_ = gained_active->GetRootWindow(); 1217 target_root_window_ = gained_active->GetRootWindow();
1217 } 1218 }
1218 1219
1219 } // namespace ash 1220 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698