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

Side by Side Diff: ui/views/mus/mus_client.h

Issue 2536943005: Adds couple of functions to WindowManagerDelegate: (Closed)
Patch Set: comment 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 | « ui/aura/test/mus/test_window_tree_client_setup.cc ('k') | ui/views/mus/mus_client.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 UI_VIEWS_MUS_MUS_CLIENT_H_ 5 #ifndef UI_VIEWS_MUS_MUS_CLIENT_H_
6 #define UI_VIEWS_MUS_MUS_CLIENT_H_ 6 #define UI_VIEWS_MUS_MUS_CLIENT_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 // Returns true if a DesktopNativeWidgetAura should be created given the 73 // Returns true if a DesktopNativeWidgetAura should be created given the
74 // specified params. If this returns false a NativeWidgetAura should be 74 // specified params. If this returns false a NativeWidgetAura should be
75 // created. 75 // created.
76 static bool ShouldCreateDesktopNativeWidgetAura( 76 static bool ShouldCreateDesktopNativeWidgetAura(
77 const Widget::InitParams& init_params); 77 const Widget::InitParams& init_params);
78 78
79 // Returns the properties to supply to mus when creating a window. 79 // Returns the properties to supply to mus when creating a window.
80 static std::map<std::string, std::vector<uint8_t>> 80 static std::map<std::string, std::vector<uint8_t>>
81 ConfigurePropertiesFromParams(const Widget::InitParams& init_params); 81 ConfigurePropertiesFromParams(const Widget::InitParams& init_params);
82 82
83 service_manager::Connector* connector() { return connector_; }
84
85 aura::WindowTreeClient* window_tree_client() { 83 aura::WindowTreeClient* window_tree_client() {
86 return window_tree_client_.get(); 84 return window_tree_client_.get();
87 } 85 }
88 86
89 PointerWatcherEventRouter2* pointer_watcher_event_router() { 87 PointerWatcherEventRouter2* pointer_watcher_event_router() {
90 return pointer_watcher_event_router_.get(); 88 return pointer_watcher_event_router_.get();
91 } 89 }
92 90
93 // Creates DesktopNativeWidgetAura with DesktopWindowTreeHostMus. This is 91 // Creates DesktopNativeWidgetAura with DesktopWindowTreeHostMus. This is
94 // set as the factory function used for creating NativeWidgets when a 92 // set as the factory function used for creating NativeWidgets when a
(...skipping 26 matching lines...) Expand all
121 // ScreenMusDelegate: 119 // ScreenMusDelegate:
122 void OnWindowManagerFrameValuesChanged() override; 120 void OnWindowManagerFrameValuesChanged() override;
123 gfx::Point GetCursorScreenPoint() override; 121 gfx::Point GetCursorScreenPoint() override;
124 aura::Window* GetWindowAtScreenPoint(const gfx::Point& point) override; 122 aura::Window* GetWindowAtScreenPoint(const gfx::Point& point) override;
125 123
126 // ui:OSExchangeDataProviderFactory::Factory: 124 // ui:OSExchangeDataProviderFactory::Factory:
127 std::unique_ptr<OSExchangeData::Provider> BuildProvider() override; 125 std::unique_ptr<OSExchangeData::Provider> BuildProvider() override;
128 126
129 static MusClient* instance_; 127 static MusClient* instance_;
130 128
131 service_manager::Connector* connector_;
132 service_manager::Identity identity_; 129 service_manager::Identity identity_;
133 130
134 base::ObserverList<MusClientObserver> observer_list_; 131 base::ObserverList<MusClientObserver> observer_list_;
135 132
136 std::unique_ptr<wm::WMState> wm_state_; 133 std::unique_ptr<wm::WMState> wm_state_;
137 134
138 std::unique_ptr<ScreenMus> screen_; 135 std::unique_ptr<ScreenMus> screen_;
139 136
140 std::unique_ptr<aura::PropertyConverter> property_converter_; 137 std::unique_ptr<aura::PropertyConverter> property_converter_;
141 138
142 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; 139 std::unique_ptr<aura::WindowTreeClient> window_tree_client_;
143 140
144 std::unique_ptr<ui::GpuService> gpu_service_; 141 std::unique_ptr<ui::GpuService> gpu_service_;
145 142
146 std::unique_ptr<PointerWatcherEventRouter2> pointer_watcher_event_router_; 143 std::unique_ptr<PointerWatcherEventRouter2> pointer_watcher_event_router_;
147 144
148 std::unique_ptr<aura::MusContextFactory> compositor_context_factory_; 145 std::unique_ptr<aura::MusContextFactory> compositor_context_factory_;
149 146
150 DISALLOW_COPY_AND_ASSIGN(MusClient); 147 DISALLOW_COPY_AND_ASSIGN(MusClient);
151 }; 148 };
152 149
153 } // namespace views 150 } // namespace views
154 151
155 #endif // UI_VIEWS_MUS_MUS_CLIENT_H_ 152 #endif // UI_VIEWS_MUS_MUS_CLIENT_H_
OLDNEW
« no previous file with comments | « ui/aura/test/mus/test_window_tree_client_setup.cc ('k') | ui/views/mus/mus_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698