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

Side by Side Diff: ash/shell.cc

Issue 1926913002: Moves more code to ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@refactor_workspace_layout_manager
Patch Set: merge to trunk Created 4 years, 7 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/root_window_controller.cc ('k') | ash/shell/toplevel_window.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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 #include "ash/system/status_area_widget.h" 56 #include "ash/system/status_area_widget.h"
57 #include "ash/system/toast/toast_manager.h" 57 #include "ash/system/toast/toast_manager.h"
58 #include "ash/system/tray/system_tray_delegate.h" 58 #include "ash/system/tray/system_tray_delegate.h"
59 #include "ash/system/tray/system_tray_notifier.h" 59 #include "ash/system/tray/system_tray_notifier.h"
60 #include "ash/utility/partial_screenshot_controller.h" 60 #include "ash/utility/partial_screenshot_controller.h"
61 #include "ash/wm/ash_focus_rules.h" 61 #include "ash/wm/ash_focus_rules.h"
62 #include "ash/wm/ash_native_cursor_manager.h" 62 #include "ash/wm/ash_native_cursor_manager.h"
63 #include "ash/wm/aura/wm_globals_aura.h" 63 #include "ash/wm/aura/wm_globals_aura.h"
64 #include "ash/wm/aura/wm_window_aura.h" 64 #include "ash/wm/aura/wm_window_aura.h"
65 #include "ash/wm/common/root_window_finder.h" 65 #include "ash/wm/common/root_window_finder.h"
66 #include "ash/wm/common/window_positioner.h"
66 #include "ash/wm/event_client_impl.h" 67 #include "ash/wm/event_client_impl.h"
67 #include "ash/wm/lock_state_controller.h" 68 #include "ash/wm/lock_state_controller.h"
68 #include "ash/wm/maximize_mode/maximize_mode_controller.h" 69 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
69 #include "ash/wm/maximize_mode/maximize_mode_window_manager.h" 70 #include "ash/wm/maximize_mode/maximize_mode_window_manager.h"
70 #include "ash/wm/mru_window_tracker.h" 71 #include "ash/wm/mru_window_tracker.h"
71 #include "ash/wm/overlay_event_filter.h" 72 #include "ash/wm/overlay_event_filter.h"
72 #include "ash/wm/overview/window_selector_controller.h" 73 #include "ash/wm/overview/window_selector_controller.h"
73 #include "ash/wm/power_button_controller.h" 74 #include "ash/wm/power_button_controller.h"
74 #include "ash/wm/resize_shadow_controller.h" 75 #include "ash/wm/resize_shadow_controller.h"
75 #include "ash/wm/root_window_layout_manager.h" 76 #include "ash/wm/root_window_layout_manager.h"
76 #include "ash/wm/system_gesture_event_filter.h" 77 #include "ash/wm/system_gesture_event_filter.h"
77 #include "ash/wm/system_modal_container_event_filter.h" 78 #include "ash/wm/system_modal_container_event_filter.h"
78 #include "ash/wm/system_modal_container_layout_manager.h" 79 #include "ash/wm/system_modal_container_layout_manager.h"
79 #include "ash/wm/toplevel_window_event_handler.h" 80 #include "ash/wm/toplevel_window_event_handler.h"
80 #include "ash/wm/video_detector.h" 81 #include "ash/wm/video_detector.h"
81 #include "ash/wm/window_animations.h" 82 #include "ash/wm/window_animations.h"
82 #include "ash/wm/window_cycle_controller.h" 83 #include "ash/wm/window_cycle_controller.h"
83 #include "ash/wm/window_positioner.h"
84 #include "ash/wm/window_properties.h" 84 #include "ash/wm/window_properties.h"
85 #include "ash/wm/window_util.h" 85 #include "ash/wm/window_util.h"
86 #include "ash/wm/workspace_controller.h" 86 #include "ash/wm/workspace_controller.h"
87 #include "base/bind.h" 87 #include "base/bind.h"
88 #include "base/memory/ptr_util.h" 88 #include "base/memory/ptr_util.h"
89 #include "base/trace_event/trace_event.h" 89 #include "base/trace_event/trace_event.h"
90 #include "ui/app_list/presenter/app_list_presenter.h" 90 #include "ui/app_list/presenter/app_list_presenter.h"
91 #include "ui/aura/client/aura_constants.h" 91 #include "ui/aura/client/aura_constants.h"
92 #include "ui/aura/env.h" 92 #include "ui/aura/env.h"
93 #include "ui/aura/layout_manager.h" 93 #include "ui/aura/layout_manager.h"
(...skipping 1157 matching lines...) Expand 10 before | Expand all | Expand 10 after
1251 1251
1252 void Shell::OnWindowActivated( 1252 void Shell::OnWindowActivated(
1253 aura::client::ActivationChangeObserver::ActivationReason reason, 1253 aura::client::ActivationChangeObserver::ActivationReason reason,
1254 aura::Window* gained_active, 1254 aura::Window* gained_active,
1255 aura::Window* lost_active) { 1255 aura::Window* lost_active) {
1256 if (gained_active) 1256 if (gained_active)
1257 target_root_window_ = gained_active->GetRootWindow(); 1257 target_root_window_ = gained_active->GetRootWindow();
1258 } 1258 }
1259 1259
1260 } // namespace ash 1260 } // namespace ash
OLDNEW
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell/toplevel_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698