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

Side by Side Diff: ash/mus/bridge/workspace_event_handler_mus.h

Issue 2539363005: Converts ash to use aura-mus (Closed)
Patch Set: add overrides 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 unified diff | Download patch
« no previous file with comments | « ash/mus/bridge/wm_window_mus_test_api.cc ('k') | ash/mus/bridge/workspace_event_handler_mus.cc » ('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 #ifndef ASH_MUS_BRIDGE_WORKSPACE_EVENT_HANDLER_MUS_H_ 5 #ifndef ASH_MUS_BRIDGE_WORKSPACE_EVENT_HANDLER_MUS_H_
6 #define ASH_MUS_BRIDGE_WORKSPACE_EVENT_HANDLER_MUS_H_ 6 #define ASH_MUS_BRIDGE_WORKSPACE_EVENT_HANDLER_MUS_H_
7 7
8 #include "ash/common/wm/workspace/workspace_event_handler.h" 8 #include "ash/common/wm/workspace/workspace_event_handler.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 10
11 namespace ui { 11 namespace aura {
12 class Window; 12 class Window;
13 } 13 }
14 14
15 namespace ash { 15 namespace ash {
16 namespace mus { 16 namespace mus {
17 17
18 // TODO(sky): investigate if can use aura version.
18 class WorkspaceEventHandlerMus : public WorkspaceEventHandler { 19 class WorkspaceEventHandlerMus : public WorkspaceEventHandler {
19 public: 20 public:
20 WorkspaceEventHandlerMus(ui::Window* workspace_window); 21 explicit WorkspaceEventHandlerMus(aura::Window* workspace_window);
21 ~WorkspaceEventHandlerMus() override; 22 ~WorkspaceEventHandlerMus() override;
22 23
23 // Returns the WorkspaceEventHandlerMus associated with |window|, or null 24 // Returns the WorkspaceEventHandlerMus associated with |window|, or null
24 // if |window| is not the workspace window. 25 // if |window| is not the workspace window.
25 static WorkspaceEventHandlerMus* Get(ui::Window* window); 26 static WorkspaceEventHandlerMus* Get(aura::Window* window);
26 27
27 // Returns the window associated with the workspace. 28 // Returns the window associated with the workspace.
28 ui::Window* workspace_window() { return workspace_window_; } 29 aura::Window* workspace_window() { return workspace_window_; }
29 30
30 private: 31 private:
31 ui::Window* workspace_window_; 32 aura::Window* workspace_window_;
32 33
33 DISALLOW_COPY_AND_ASSIGN(WorkspaceEventHandlerMus); 34 DISALLOW_COPY_AND_ASSIGN(WorkspaceEventHandlerMus);
34 }; 35 };
35 36
36 } // namespace mus 37 } // namespace mus
37 } // namespace ash 38 } // namespace ash
38 39
39 #endif // ASH_MUS_BRIDGE_WORKSPACE_EVENT_HANDLER_MUS_H_ 40 #endif // ASH_MUS_BRIDGE_WORKSPACE_EVENT_HANDLER_MUS_H_
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_window_mus_test_api.cc ('k') | ash/mus/bridge/workspace_event_handler_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698