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

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: merge 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
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | ash/mus/bridge/wm_window_mus.h » ('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 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 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 return nullptr; 310 return nullptr;
310 } 311 }
311 312
312 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> 313 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
313 WmShellMus::CreateScopedDisableInternalMouseAndKeyboard() { 314 WmShellMus::CreateScopedDisableInternalMouseAndKeyboard() {
314 // TODO: needs implementation for mus, http://crbug.com/624967. 315 // TODO: needs implementation for mus, http://crbug.com/624967.
315 NOTIMPLEMENTED(); 316 NOTIMPLEMENTED();
316 return nullptr; 317 return nullptr;
317 } 318 }
318 319
320 std::unique_ptr<WmImmersiveFullscreenController>
321 WmShellMus::CreateImmersiveFullscreenController() {
322 // TODO(sky): port ImmersiveFullscreenController, http://crbug.com/548435.
323 return nullptr;
324 }
325
319 void WmShellMus::OnOverviewModeStarting() { 326 void WmShellMus::OnOverviewModeStarting() {
320 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), 327 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(),
321 OnOverviewModeStarting()); 328 OnOverviewModeStarting());
322 } 329 }
323 330
324 void WmShellMus::OnOverviewModeEnded() { 331 void WmShellMus::OnOverviewModeEnded() {
325 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), OnOverviewModeEnded()); 332 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), OnOverviewModeEnded());
326 } 333 }
327 334
328 SessionStateDelegate* WmShellMus::GetSessionStateDelegate() { 335 SessionStateDelegate* WmShellMus::GetSessionStateDelegate() {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 OnWindowActivated(gained_active, lost_active)); 398 OnWindowActivated(gained_active, lost_active));
392 } 399 }
393 400
394 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { 401 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) {
395 DCHECK_EQ(window_tree_client(), client); 402 DCHECK_EQ(window_tree_client(), client);
396 client->RemoveObserver(this); 403 client->RemoveObserver(this);
397 } 404 }
398 405
399 } // namespace mus 406 } // namespace mus
400 } // namespace ash 407 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | ash/mus/bridge/wm_window_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698