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

Unified Diff: ash/mus/bridge/workspace_event_handler_mus.h

Issue 2539363005: Converts ash to use aura-mus (Closed)
Patch Set: merge Created 4 years 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
Index: ash/mus/bridge/workspace_event_handler_mus.h
diff --git a/ash/mus/bridge/workspace_event_handler_mus.h b/ash/mus/bridge/workspace_event_handler_mus.h
index 87d1df50a3f9f600c71a5952557172e8d888c906..da1027e5f48fe2c51f17d72d15241f47acec5f64 100644
--- a/ash/mus/bridge/workspace_event_handler_mus.h
+++ b/ash/mus/bridge/workspace_event_handler_mus.h
@@ -8,27 +8,28 @@
#include "ash/common/wm/workspace/workspace_event_handler.h"
#include "base/macros.h"
-namespace ui {
+namespace aura {
class Window;
}
namespace ash {
namespace mus {
+// TODO(sky): investigate if can use aura version.
class WorkspaceEventHandlerMus : public WorkspaceEventHandler {
public:
- WorkspaceEventHandlerMus(ui::Window* workspace_window);
+ WorkspaceEventHandlerMus(aura::Window* workspace_window);
James Cook 2016/12/05 19:21:44 nit: explicit
sky 2016/12/05 21:39:19 Done.
~WorkspaceEventHandlerMus() override;
// Returns the WorkspaceEventHandlerMus associated with |window|, or null
// if |window| is not the workspace window.
- static WorkspaceEventHandlerMus* Get(ui::Window* window);
+ static WorkspaceEventHandlerMus* Get(aura::Window* window);
// Returns the window associated with the workspace.
- ui::Window* workspace_window() { return workspace_window_; }
+ aura::Window* workspace_window() { return workspace_window_; }
private:
- ui::Window* workspace_window_;
+ aura::Window* workspace_window_;
DISALLOW_COPY_AND_ASSIGN(WorkspaceEventHandlerMus);
};

Powered by Google App Engine
This is Rietveld 408576698