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

Side by Side Diff: ash/mus/bridge/wm_shell_mus.cc

Issue 2285703003: Moves WorkspaceEventHandler to ash/common (Closed)
Patch Set: merge 2 trunk Created 4 years, 3 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/workspace_event_handler_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/wallpaper/wallpaper_delegate.h" 17 #include "ash/common/wallpaper/wallpaper_delegate.h"
18 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h" 18 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h"
19 #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"
20 #include "ash/common/wm/mru_window_tracker.h" 20 #include "ash/common/wm/mru_window_tracker.h"
21 #include "ash/common/wm/window_cycle_event_filter.h" 21 #include "ash/common/wm/window_cycle_event_filter.h"
22 #include "ash/common/wm/window_resizer.h" 22 #include "ash/common/wm/window_resizer.h"
23 #include "ash/common/wm_activation_observer.h" 23 #include "ash/common/wm_activation_observer.h"
24 #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h" 24 #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h"
25 #include "ash/mus/accelerators/accelerator_controller_registrar.h" 25 #include "ash/mus/accelerators/accelerator_controller_registrar.h"
26 #include "ash/mus/bridge/immersive_handler_factory_mus.h" 26 #include "ash/mus/bridge/immersive_handler_factory_mus.h"
27 #include "ash/mus/bridge/wm_root_window_controller_mus.h" 27 #include "ash/mus/bridge/wm_root_window_controller_mus.h"
28 #include "ash/mus/bridge/wm_window_mus.h" 28 #include "ash/mus/bridge/wm_window_mus.h"
29 #include "ash/mus/bridge/workspace_event_handler_mus.h"
29 #include "ash/mus/container_ids.h" 30 #include "ash/mus/container_ids.h"
30 #include "ash/mus/drag_window_resizer.h" 31 #include "ash/mus/drag_window_resizer.h"
31 #include "ash/mus/root_window_controller.h" 32 #include "ash/mus/root_window_controller.h"
32 #include "ash/mus/window_manager.h" 33 #include "ash/mus/window_manager.h"
33 #include "ash/shared/immersive_fullscreen_controller.h" 34 #include "ash/shared/immersive_fullscreen_controller.h"
34 #include "base/memory/ptr_util.h" 35 #include "base/memory/ptr_util.h"
35 #include "components/user_manager/user_info_impl.h" 36 #include "components/user_manager/user_info_impl.h"
36 #include "services/ui/common/util.h" 37 #include "services/ui/common/util.h"
37 #include "services/ui/public/cpp/window.h" 38 #include "services/ui/public/cpp/window.h"
38 #include "services/ui/public/cpp/window_tree_client.h" 39 #include "services/ui/public/cpp/window_tree_client.h"
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 return nullptr; 339 return nullptr;
339 } 340 }
340 341
341 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> 342 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
342 WmShellMus::CreateScopedDisableInternalMouseAndKeyboard() { 343 WmShellMus::CreateScopedDisableInternalMouseAndKeyboard() {
343 // TODO: needs implementation for mus, http://crbug.com/624967. 344 // TODO: needs implementation for mus, http://crbug.com/624967.
344 NOTIMPLEMENTED(); 345 NOTIMPLEMENTED();
345 return nullptr; 346 return nullptr;
346 } 347 }
347 348
349 std::unique_ptr<WorkspaceEventHandler> WmShellMus::CreateWorkspaceEventHandler(
350 WmWindow* workspace_window) {
351 return base::MakeUnique<WorkspaceEventHandlerMus>(
352 WmWindowMus::GetMusWindow(workspace_window));
353 }
354
348 std::unique_ptr<ImmersiveFullscreenController> 355 std::unique_ptr<ImmersiveFullscreenController>
349 WmShellMus::CreateImmersiveFullscreenController() { 356 WmShellMus::CreateImmersiveFullscreenController() {
350 return base::MakeUnique<ImmersiveFullscreenController>(); 357 return base::MakeUnique<ImmersiveFullscreenController>();
351 } 358 }
352 359
353 void WmShellMus::OnOverviewModeStarting() { 360 void WmShellMus::OnOverviewModeStarting() {
354 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), 361 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(),
355 OnOverviewModeStarting()); 362 OnOverviewModeStarting());
356 } 363 }
357 364
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 OnWindowActivated(gained_active, lost_active)); 432 OnWindowActivated(gained_active, lost_active));
426 } 433 }
427 434
428 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { 435 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) {
429 DCHECK_EQ(window_tree_client(), client); 436 DCHECK_EQ(window_tree_client(), client);
430 client->RemoveObserver(this); 437 client->RemoveObserver(this);
431 } 438 }
432 439
433 } // namespace mus 440 } // namespace mus
434 } // namespace ash 441 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | ash/mus/bridge/workspace_event_handler_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698