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

Side by Side Diff: ash/mus/bridge/wm_shell_mus.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/mus/bridge/wm_shell_mus.h" 5 #include "ash/mus/bridge/wm_shell_mus.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/common/accelerators/accelerator_controller.h" 9 #include "ash/common/accelerators/accelerator_controller.h"
10 #include "ash/common/display/display_info.h" 10 #include "ash/common/display/display_info.h"
11 #include "ash/common/keyboard/keyboard_ui.h" 11 #include "ash/common/keyboard/keyboard_ui.h"
12 #include "ash/common/session/session_state_delegate.h" 12 #include "ash/common/session/session_state_delegate.h"
13 #include "ash/common/shell_delegate.h" 13 #include "ash/common/shell_delegate.h"
14 #include "ash/common/shell_observer.h" 14 #include "ash/common/shell_observer.h"
15 #include "ash/common/shell_window_ids.h" 15 #include "ash/common/shell_window_ids.h"
16 #include "ash/common/system/tray/default_system_tray_delegate.h" 16 #include "ash/common/system/tray/default_system_tray_delegate.h"
17 #include "ash/common/wm/immersive/wm_immersive_fullscreen_controller.h"
17 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h" 18 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h"
18 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard .h" 19 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard .h"
19 #include "ash/common/wm/mru_window_tracker.h" 20 #include "ash/common/wm/mru_window_tracker.h"
20 #include "ash/common/wm/window_cycle_event_filter.h" 21 #include "ash/common/wm/window_cycle_event_filter.h"
21 #include "ash/common/wm/window_resizer.h" 22 #include "ash/common/wm/window_resizer.h"
22 #include "ash/common/wm_activation_observer.h" 23 #include "ash/common/wm_activation_observer.h"
23 #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h" 24 #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h"
24 #include "ash/mus/accelerators/accelerator_controller_registrar.h" 25 #include "ash/mus/accelerators/accelerator_controller_registrar.h"
25 #include "ash/mus/bridge/wm_root_window_controller_mus.h" 26 #include "ash/mus/bridge/wm_root_window_controller_mus.h"
26 #include "ash/mus/bridge/wm_window_mus.h" 27 #include "ash/mus/bridge/wm_window_mus.h"
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 return nullptr; 297 return nullptr;
297 } 298 }
298 299
299 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> 300 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
300 WmShellMus::CreateScopedDisableInternalMouseAndKeyboard() { 301 WmShellMus::CreateScopedDisableInternalMouseAndKeyboard() {
301 // TODO: needs implementation for mus, http://crbug.com/624967. 302 // TODO: needs implementation for mus, http://crbug.com/624967.
302 NOTIMPLEMENTED(); 303 NOTIMPLEMENTED();
303 return nullptr; 304 return nullptr;
304 } 305 }
305 306
307 std::unique_ptr<WmImmersiveFullscreenController>
308 WmShellMus::CreateImmersiveFullscreenController() {
309 // TODO(sky): port ImmersiveFullscreenController, http://crbug.com/548435.
310 return nullptr;
311 }
312
306 void WmShellMus::OnOverviewModeStarting() { 313 void WmShellMus::OnOverviewModeStarting() {
307 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), 314 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(),
308 OnOverviewModeStarting()); 315 OnOverviewModeStarting());
309 } 316 }
310 317
311 void WmShellMus::OnOverviewModeEnded() { 318 void WmShellMus::OnOverviewModeEnded() {
312 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), OnOverviewModeEnded()); 319 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), OnOverviewModeEnded());
313 } 320 }
314 321
315 SessionStateDelegate* WmShellMus::GetSessionStateDelegate() { 322 SessionStateDelegate* WmShellMus::GetSessionStateDelegate() {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 OnWindowActivated(gained_active, lost_active)); 385 OnWindowActivated(gained_active, lost_active));
379 } 386 }
380 387
381 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { 388 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) {
382 DCHECK_EQ(window_tree_client(), client); 389 DCHECK_EQ(window_tree_client(), client);
383 client->RemoveObserver(this); 390 client->RemoveObserver(this);
384 } 391 }
385 392
386 } // namespace mus 393 } // namespace mus
387 } // namespace ash 394 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698