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

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

Issue 2412593002: IME for Mus: Send ack for key events after IME driver processes the event. (Closed)
Patch Set: Addressed feedback. Created 4 years, 2 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/views/mus/input_method_mus.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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 class CursorManager; 52 class CursorManager;
53 class FocusController; 53 class FocusController;
54 } 54 }
55 55
56 namespace views { 56 namespace views {
57 namespace corewm { 57 namespace corewm {
58 class TooltipController; 58 class TooltipController;
59 } 59 }
60 class DropHelper; 60 class DropHelper;
61 class DropTargetMus; 61 class DropTargetMus;
62 class InputMethodMus;
62 class TooltipManagerAura; 63 class TooltipManagerAura;
63 class WidgetDelegate; 64 class WidgetDelegate;
64 65
65 // An implementation of NativeWidget that binds to a ui::Window. Because Aura 66 // An implementation of NativeWidget that binds to a ui::Window. Because Aura
66 // is used extensively within Views code, this code uses aura and binds to the 67 // is used extensively within Views code, this code uses aura and binds to the
67 // ui::Window via a Mus-specific aura::WindowTreeHost impl. Because the root 68 // ui::Window via a Mus-specific aura::WindowTreeHost impl. Because the root
68 // aura::Window in a hierarchy is created without a delegate by the 69 // aura::Window in a hierarchy is created without a delegate by the
69 // aura::WindowTreeHost, we must create a child aura::Window in this class 70 // aura::WindowTreeHost, we must create a child aura::Window in this class
70 // (content_) and attach it to the root. 71 // (content_) and attach it to the root.
71 class VIEWS_MUS_EXPORT NativeWidgetMus 72 class VIEWS_MUS_EXPORT NativeWidgetMus
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_; 295 std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_;
295 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_; 296 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_;
296 std::unique_ptr<wm::CursorManager> cursor_manager_; 297 std::unique_ptr<wm::CursorManager> cursor_manager_;
297 298
298 std::unique_ptr<DropHelper> drop_helper_; 299 std::unique_ptr<DropHelper> drop_helper_;
299 int last_drop_operation_; 300 int last_drop_operation_;
300 301
301 std::unique_ptr<corewm::TooltipController> tooltip_controller_; 302 std::unique_ptr<corewm::TooltipController> tooltip_controller_;
302 std::unique_ptr<TooltipManagerAura> tooltip_manager_; 303 std::unique_ptr<TooltipManagerAura> tooltip_manager_;
303 304
305 std::unique_ptr<InputMethodMus> input_method_;
306
304 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_; 307 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_;
305 308
306 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus); 309 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus);
307 }; 310 };
308 311
309 } // namespace views 312 } // namespace views
310 313
311 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ 314 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
OLDNEW
« no previous file with comments | « ui/views/mus/input_method_mus.cc ('k') | ui/views/mus/native_widget_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698