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

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

Issue 2013503002: Keep non-key event handling in-house for NativeWidgetMus Base URL: https://chromium.googlesource.com/chromium/src.git@native_widget_mus9
Patch Set: Use aura::EnvInputStateController for mouse events 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/platform_window/stub/stub_window.cc ('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 11 matching lines...) Expand all
22 #include "ui/views/mus/mus_export.h" 22 #include "ui/views/mus/mus_export.h"
23 #include "ui/views/mus/window_tree_host_mus.h" 23 #include "ui/views/mus/window_tree_host_mus.h"
24 #include "ui/views/widget/native_widget_private.h" 24 #include "ui/views/widget/native_widget_private.h"
25 25
26 namespace aura { 26 namespace aura {
27 namespace client { 27 namespace client {
28 class DefaultCaptureClient; 28 class DefaultCaptureClient;
29 class ScreenPositionClient; 29 class ScreenPositionClient;
30 class WindowTreeClient; 30 class WindowTreeClient;
31 } 31 }
32 class EnvInputStateController;
32 class Window; 33 class Window;
33 } 34 }
34 35
35 namespace mus { 36 namespace mus {
36 class Window; 37 class Window;
37 class WindowTreeConnection; 38 class WindowTreeConnection;
38 namespace mojom { 39 namespace mojom {
39 enum class Cursor; 40 enum class Cursor;
40 enum class EventResult; 41 enum class EventResult;
41 } 42 }
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 262
262 // Aura configuration. 263 // Aura configuration.
263 std::unique_ptr<SurfaceContextFactory> context_factory_; 264 std::unique_ptr<SurfaceContextFactory> context_factory_;
264 std::unique_ptr<WindowTreeHostMus> window_tree_host_; 265 std::unique_ptr<WindowTreeHostMus> window_tree_host_;
265 aura::Window* content_; 266 aura::Window* content_;
266 std::unique_ptr<wm::FocusController> focus_client_; 267 std::unique_ptr<wm::FocusController> focus_client_;
267 std::unique_ptr<MusCaptureClient> capture_client_; 268 std::unique_ptr<MusCaptureClient> capture_client_;
268 std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_; 269 std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_;
269 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_; 270 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_;
270 std::unique_ptr<wm::CursorManager> cursor_manager_; 271 std::unique_ptr<wm::CursorManager> cursor_manager_;
272 std::unique_ptr<aura::EnvInputStateController> aura_env_controller_;
271 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_; 273 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_;
272 274
273 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus); 275 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus);
274 }; 276 };
275 277
276 } // namespace views 278 } // namespace views
277 279
278 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ 280 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
OLDNEW
« no previous file with comments | « ui/platform_window/stub/stub_window.cc ('k') | ui/views/mus/native_widget_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698