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

Side by Side Diff: ash/aura/wm_shell_aura.cc

Issue 2222653002: Moves CustomFrameViewAsh to common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comment Created 4 years, 4 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/aura/wm_shell_aura.h" 5 #include "ash/aura/wm_shell_aura.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/aura/wm_window_aura.h" 9 #include "ash/aura/wm_window_aura.h"
10 #include "ash/common/session/session_state_delegate.h" 10 #include "ash/common/session/session_state_delegate.h"
11 #include "ash/common/shell_delegate.h" 11 #include "ash/common/shell_delegate.h"
12 #include "ash/common/shell_observer.h" 12 #include "ash/common/shell_observer.h"
13 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard .h" 13 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard .h"
14 #include "ash/common/wm/mru_window_tracker.h" 14 #include "ash/common/wm/mru_window_tracker.h"
15 #include "ash/common/wm/overview/window_selector_controller.h" 15 #include "ash/common/wm/overview/window_selector_controller.h"
16 #include "ash/common/wm_activation_observer.h" 16 #include "ash/common/wm_activation_observer.h"
17 #include "ash/common/wm_display_observer.h" 17 #include "ash/common/wm_display_observer.h"
18 #include "ash/display/display_manager.h" 18 #include "ash/display/display_manager.h"
19 #include "ash/display/window_tree_host_manager.h" 19 #include "ash/display/window_tree_host_manager.h"
20 #include "ash/metrics/task_switch_metrics_recorder.h" 20 #include "ash/metrics/task_switch_metrics_recorder.h"
21 #include "ash/shell.h" 21 #include "ash/shell.h"
22 #include "ash/touch/touch_uma.h" 22 #include "ash/touch/touch_uma.h"
23 #include "ash/wm/drag_window_resizer.h" 23 #include "ash/wm/drag_window_resizer.h"
24 #include "ash/wm/immersive_fullscreen_controller.h"
24 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h" 25 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h"
25 #include "ash/wm/screen_pinning_controller.h" 26 #include "ash/wm/screen_pinning_controller.h"
26 #include "ash/wm/window_cycle_event_filter_aura.h" 27 #include "ash/wm/window_cycle_event_filter_aura.h"
27 #include "ash/wm/window_util.h" 28 #include "ash/wm/window_util.h"
28 #include "base/memory/ptr_util.h" 29 #include "base/memory/ptr_util.h"
29 #include "ui/aura/client/focus_client.h" 30 #include "ui/aura/client/focus_client.h"
30 #include "ui/aura/env.h" 31 #include "ui/aura/env.h"
31 #include "ui/wm/public/activation_client.h" 32 #include "ui/wm/public/activation_client.h"
32 33
33 #if defined(OS_CHROMEOS) 34 #if defined(OS_CHROMEOS)
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> 169 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
169 WmShellAura::CreateScopedDisableInternalMouseAndKeyboard() { 170 WmShellAura::CreateScopedDisableInternalMouseAndKeyboard() {
170 #if defined(USE_X11) 171 #if defined(USE_X11)
171 return base::WrapUnique(new ScopedDisableInternalMouseAndKeyboardX11); 172 return base::WrapUnique(new ScopedDisableInternalMouseAndKeyboardX11);
172 #elif defined(USE_OZONE) 173 #elif defined(USE_OZONE)
173 return base::WrapUnique(new ScopedDisableInternalMouseAndKeyboardOzone); 174 return base::WrapUnique(new ScopedDisableInternalMouseAndKeyboardOzone);
174 #endif 175 #endif
175 return nullptr; 176 return nullptr;
176 } 177 }
177 178
179 std::unique_ptr<WmImmersiveFullscreenController>
180 WmShellAura::CreateImmersiveFullscreenController() {
181 return base::MakeUnique<ImmersiveFullscreenController>();
182 }
183
178 void WmShellAura::OnOverviewModeStarting() { 184 void WmShellAura::OnOverviewModeStarting() {
179 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), 185 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(),
180 OnOverviewModeStarting()); 186 OnOverviewModeStarting());
181 } 187 }
182 188
183 void WmShellAura::OnOverviewModeEnded() { 189 void WmShellAura::OnOverviewModeEnded() {
184 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), OnOverviewModeEnded()); 190 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), OnOverviewModeEnded());
185 } 191 }
186 192
187 SessionStateDelegate* WmShellAura::GetSessionStateDelegate() { 193 SessionStateDelegate* WmShellAura::GetSessionStateDelegate() {
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, 262 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
257 OnDisplayConfigurationChanging()); 263 OnDisplayConfigurationChanging());
258 } 264 }
259 265
260 void WmShellAura::OnDisplayConfigurationChanged() { 266 void WmShellAura::OnDisplayConfigurationChanged() {
261 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, 267 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
262 OnDisplayConfigurationChanged()); 268 OnDisplayConfigurationChanged());
263 } 269 }
264 270
265 } // namespace ash 271 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698