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

Side by Side Diff: mash/wm/bridge/wm_root_window_controller_mus.h

Issue 1984293002: Random fixes for mash bridge classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comment Created 4 years, 7 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 | « mash/wm/bridge/wm_lookup_mus.cc ('k') | mash/wm/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 MASH_WM_BRIDGE_WM_ROOT_CONTROLLER_MUS_H_ 5 #ifndef MASH_WM_BRIDGE_WM_ROOT_CONTROLLER_MUS_H_
6 #define MASH_WM_BRIDGE_WM_ROOT_CONTROLLER_MUS_H_ 6 #define MASH_WM_BRIDGE_WM_ROOT_CONTROLLER_MUS_H_
7 7
8 #include "ash/wm/common/wm_root_window_controller.h" 8 #include "ash/wm/common/wm_root_window_controller.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/observer_list.h" 10 #include "base/observer_list.h"
(...skipping 23 matching lines...) Expand all
34 static WmRootWindowControllerMus* Get(mus::Window* window) { 34 static WmRootWindowControllerMus* Get(mus::Window* window) {
35 return const_cast<WmRootWindowControllerMus*>( 35 return const_cast<WmRootWindowControllerMus*>(
36 Get(const_cast<const mus::Window*>(window))); 36 Get(const_cast<const mus::Window*>(window)));
37 } 37 }
38 static const WmRootWindowControllerMus* Get(const mus::Window* window); 38 static const WmRootWindowControllerMus* Get(const mus::Window* window);
39 39
40 RootWindowController* root_window_controller() { 40 RootWindowController* root_window_controller() {
41 return root_window_controller_; 41 return root_window_controller_;
42 } 42 }
43 43
44 void NotifyFullscreenStateChange(bool is_fullscreen);
45
44 // Screen conversion functions. 46 // Screen conversion functions.
45 gfx::Point ConvertPointToScreen(const WmWindowMus* source, 47 gfx::Point ConvertPointToScreen(const WmWindowMus* source,
46 const gfx::Point& point) const; 48 const gfx::Point& point) const;
47 gfx::Point ConvertPointFromScreen(const WmWindowMus* target, 49 gfx::Point ConvertPointFromScreen(const WmWindowMus* target,
48 const gfx::Point& point) const; 50 const gfx::Point& point) const;
49 51
50 const display::Display& GetDisplay() const; 52 const display::Display& GetDisplay() const;
51 53
52 // WmRootWindowController: 54 // WmRootWindowController:
53 bool HasShelf() override; 55 bool HasShelf() override;
54 ash::wm::WmGlobals* GetGlobals() override; 56 ash::wm::WmGlobals* GetGlobals() override;
55 ash::wm::WorkspaceWindowState GetWorkspaceWindowState() override; 57 ash::wm::WorkspaceWindowState GetWorkspaceWindowState() override;
56 ash::AlwaysOnTopController* GetAlwaysOnTopController() override; 58 ash::AlwaysOnTopController* GetAlwaysOnTopController() override;
57 ash::wm::WmShelf* GetShelf() override; 59 ash::wm::WmShelf* GetShelf() override;
58 ash::wm::WmWindow* GetWindow() override; 60 ash::wm::WmWindow* GetWindow() override;
59 void ConfigureWidgetInitParamsForContainer( 61 void ConfigureWidgetInitParamsForContainer(
60 views::Widget* widget, 62 views::Widget* widget,
61 int shell_container_id, 63 int shell_container_id,
62 views::Widget::InitParams* init_params) override; 64 views::Widget::InitParams* init_params) override;
63 ash::wm::WmWindow* FindEventTarget( 65 ash::wm::WmWindow* FindEventTarget(
64 const gfx::Point& location_in_screen) override; 66 const gfx::Point& location_in_screen) override;
65 void AddObserver(ash::wm::WmRootWindowControllerObserver* observer) override; 67 void AddObserver(ash::wm::WmRootWindowControllerObserver* observer) override;
66 void RemoveObserver( 68 void RemoveObserver(
67 ash::wm::WmRootWindowControllerObserver* observer) override; 69 ash::wm::WmRootWindowControllerObserver* observer) override;
68 70
69 private: 71 private:
70 WmGlobalsMus* globals_; 72 WmGlobalsMus* globals_;
71 RootWindowController* root_window_controller_; 73 RootWindowController* root_window_controller_;
74 base::ObserverList<ash::wm::WmRootWindowControllerObserver> observers_;
72 75
73 DISALLOW_COPY_AND_ASSIGN(WmRootWindowControllerMus); 76 DISALLOW_COPY_AND_ASSIGN(WmRootWindowControllerMus);
74 }; 77 };
75 78
76 } // namespace wm 79 } // namespace wm
77 } // namespace mash 80 } // namespace mash
78 81
79 #endif // MASH_WM_BRIDGE_WM_ROOT_CONTROLLER_MUS_H_ 82 #endif // MASH_WM_BRIDGE_WM_ROOT_CONTROLLER_MUS_H_
OLDNEW
« no previous file with comments | « mash/wm/bridge/wm_lookup_mus.cc ('k') | mash/wm/bridge/wm_root_window_controller_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698