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

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

Issue 1988283002: Implement and test aura::client::CaptureClient in views::NativeWidgetMus for plumbing (Set|Release)… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@native_widget_mus7
Patch Set: Use inheritance for MusCaptureClient Created 4 years, 6 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 | « ui/aura/client/default_capture_client.h ('k') | ui/views/mus/native_widget_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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_NATIVE_WIDGET_MUS_H_ 5 #ifndef UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
6 #define UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ 6 #define UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 // Overridden from mus::InputEventHandler: 220 // Overridden from mus::InputEventHandler:
221 void OnWindowInputEvent( 221 void OnWindowInputEvent(
222 mus::Window* view, 222 mus::Window* view,
223 const ui::Event& event, 223 const ui::Event& event,
224 std::unique_ptr<base::Callback<void(mus::mojom::EventResult)>>* 224 std::unique_ptr<base::Callback<void(mus::mojom::EventResult)>>*
225 ack_callback) override; 225 ack_callback) override;
226 226
227 private: 227 private:
228 friend class NativeWidgetMusTest; 228 friend class NativeWidgetMusTest;
229 class MusWindowObserver; 229 class MusWindowObserver;
230 class MusCaptureClient;
230 231
231 ui::PlatformWindowDelegate* platform_window_delegate() { 232 ui::PlatformWindowDelegate* platform_window_delegate() {
232 return window_tree_host(); 233 return window_tree_host();
233 } 234 }
234 235
235 void set_last_cursor(mus::mojom::Cursor cursor) { last_cursor_ = cursor; } 236 void set_last_cursor(mus::mojom::Cursor cursor) { last_cursor_ = cursor; }
236 void SetShowState(mus::mojom::ShowState show_state); 237 void SetShowState(mus::mojom::ShowState show_state);
237 238
238 void OnMusWindowVisibilityChanging(mus::Window* window); 239 void OnMusWindowVisibilityChanging(mus::Window* window);
239 void OnMusWindowVisibilityChanged(mus::Window* window); 240 void OnMusWindowVisibilityChanged(mus::Window* window);
(...skipping 11 matching lines...) Expand all
251 252
252 // Functions with the same name require the mus::WindowObserver to be in 253 // Functions with the same name require the mus::WindowObserver to be in
253 // a separate class. 254 // a separate class.
254 std::unique_ptr<MusWindowObserver> mus_window_observer_; 255 std::unique_ptr<MusWindowObserver> mus_window_observer_;
255 256
256 // Aura configuration. 257 // Aura configuration.
257 std::unique_ptr<SurfaceContextFactory> context_factory_; 258 std::unique_ptr<SurfaceContextFactory> context_factory_;
258 std::unique_ptr<WindowTreeHostMus> window_tree_host_; 259 std::unique_ptr<WindowTreeHostMus> window_tree_host_;
259 aura::Window* content_; 260 aura::Window* content_;
260 std::unique_ptr<wm::FocusController> focus_client_; 261 std::unique_ptr<wm::FocusController> focus_client_;
261 std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_; 262 std::unique_ptr<MusCaptureClient> capture_client_;
262 std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_; 263 std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_;
263 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_; 264 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_;
264 std::unique_ptr<wm::CursorManager> cursor_manager_; 265 std::unique_ptr<wm::CursorManager> cursor_manager_;
265 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_; 266 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_;
266 267
267 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus); 268 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus);
268 }; 269 };
269 270
270 } // namespace views 271 } // namespace views
271 272
272 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ 273 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
OLDNEW
« no previous file with comments | « ui/aura/client/default_capture_client.h ('k') | ui/views/mus/native_widget_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698