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

Unified Diff: ash/mus/bridge/wm_shell_mus.cc

Issue 2285703003: Moves WorkspaceEventHandler to ash/common (Closed)
Patch Set: merge 2 trunk 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_shell_mus.cc
diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc
index 2c9bad3ff8de174c0556f3d18787d90622499897..f311fda5ae8f090d24262f6601534366cbd1b40d 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -26,6 +26,7 @@
#include "ash/mus/bridge/immersive_handler_factory_mus.h"
#include "ash/mus/bridge/wm_root_window_controller_mus.h"
#include "ash/mus/bridge/wm_window_mus.h"
+#include "ash/mus/bridge/workspace_event_handler_mus.h"
#include "ash/mus/container_ids.h"
#include "ash/mus/drag_window_resizer.h"
#include "ash/mus/root_window_controller.h"
@@ -345,6 +346,12 @@ WmShellMus::CreateScopedDisableInternalMouseAndKeyboard() {
return nullptr;
}
+std::unique_ptr<WorkspaceEventHandler> WmShellMus::CreateWorkspaceEventHandler(
+ WmWindow* workspace_window) {
+ return base::MakeUnique<WorkspaceEventHandlerMus>(
+ WmWindowMus::GetMusWindow(workspace_window));
+}
+
std::unique_ptr<ImmersiveFullscreenController>
WmShellMus::CreateImmersiveFullscreenController() {
return base::MakeUnique<ImmersiveFullscreenController>();
« 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