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

Side by Side Diff: ash/mus/bridge/wm_root_window_controller_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/README.md ('k') | ash/mus/bridge/wm_root_window_controller_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_WM_ROOT_WINDOW_CONTROLLER_MUS_H_ 5 #ifndef ASH_MUS_BRIDGE_WM_ROOT_WINDOW_CONTROLLER_MUS_H_
6 #define ASH_MUS_BRIDGE_WM_ROOT_WINDOW_CONTROLLER_MUS_H_ 6 #define ASH_MUS_BRIDGE_WM_ROOT_WINDOW_CONTROLLER_MUS_H_
7 7
8 #include "ash/common/wm_root_window_controller.h" 8 #include "ash/common/wm_root_window_controller.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 10
11 namespace aura {
12 class Window;
13 }
14
11 namespace display { 15 namespace display {
12 class Display; 16 class Display;
13 } 17 }
14 18
15 namespace ui {
16 class Window;
17 }
18
19 namespace ash { 19 namespace ash {
20 namespace mus { 20 namespace mus {
21 21
22 class RootWindowController; 22 class RootWindowController;
23 class WmShellMus; 23 class WmShellMus;
24 class WmWindowMus; 24 class WmWindowMus;
25 25
26 // WmRootWindowController implementations for mus. 26 // WmRootWindowController implementations for mus.
27 class WmRootWindowControllerMus : public WmRootWindowController { 27 class WmRootWindowControllerMus : public WmRootWindowController {
28 public: 28 public:
29 WmRootWindowControllerMus(WmShellMus* shell, 29 WmRootWindowControllerMus(WmShellMus* shell,
30 RootWindowController* root_window_controller); 30 RootWindowController* root_window_controller);
31 ~WmRootWindowControllerMus() override; 31 ~WmRootWindowControllerMus() override;
32 32
33 static WmRootWindowControllerMus* Get(ui::Window* window) { 33 static WmRootWindowControllerMus* Get(aura::Window* window) {
34 return const_cast<WmRootWindowControllerMus*>( 34 return const_cast<WmRootWindowControllerMus*>(
35 Get(const_cast<const ui::Window*>(window))); 35 Get(const_cast<const aura::Window*>(window)));
36 } 36 }
37 static const WmRootWindowControllerMus* Get(const ui::Window* window); 37 static const WmRootWindowControllerMus* Get(const aura::Window* window);
38 38
39 RootWindowController* root_window_controller() { 39 RootWindowController* root_window_controller() {
40 return root_window_controller_; 40 return root_window_controller_;
41 } 41 }
42 42
43 // Screen conversion functions. 43 // Screen conversion functions.
44 gfx::Point ConvertPointToScreen(const WmWindowMus* source, 44 gfx::Point ConvertPointToScreen(const WmWindowMus* source,
45 const gfx::Point& point) const; 45 const gfx::Point& point) const;
46 gfx::Point ConvertPointFromScreen(const WmWindowMus* target, 46 gfx::Point ConvertPointFromScreen(const WmWindowMus* target,
47 const gfx::Point& point) const; 47 const gfx::Point& point) const;
(...skipping 24 matching lines...) Expand all
72 WmShellMus* shell_; 72 WmShellMus* shell_;
73 RootWindowController* root_window_controller_; 73 RootWindowController* root_window_controller_;
74 74
75 DISALLOW_COPY_AND_ASSIGN(WmRootWindowControllerMus); 75 DISALLOW_COPY_AND_ASSIGN(WmRootWindowControllerMus);
76 }; 76 };
77 77
78 } // namespace mus 78 } // namespace mus
79 } // namespace ash 79 } // namespace ash
80 80
81 #endif // ASH_MUS_BRIDGE_WM_ROOT_WINDOW_CONTROLLER_MUS_H_ 81 #endif // ASH_MUS_BRIDGE_WM_ROOT_WINDOW_CONTROLLER_MUS_H_
OLDNEW
« no previous file with comments | « ash/mus/bridge/README.md ('k') | ash/mus/bridge/wm_root_window_controller_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698