ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc - Issue 1177503003: Remove the 2-level input method system & InputMethodBridge.

Side by Side Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc

Issue 1177503003: Remove the 2-level input method system & InputMethodBridge. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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

« ui/views/widget/desktop_aura/desktop_native_widget_aura.cc ('K') | « ui/views/widget/desktop_aura/desktop_native_widget_aura.cc ('k') | ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc » ('j') | ui/views/widget/native_widget_private.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"	5 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"

6	6

7 #include "base/win/metro.h"	7 #include "base/win/metro.h"

8 #include "third_party/skia/include/core/SkPath.h"	8 #include "third_party/skia/include/core/SkPath.h"

9 #include "third_party/skia/include/core/SkRegion.h"	9 #include "third_party/skia/include/core/SkRegion.h"

10 #include "ui/aura/client/aura_constants.h"	10 #include "ui/aura/client/aura_constants.h"

11 #include "ui/aura/client/cursor_client.h"	11 #include "ui/aura/client/cursor_client.h"

12 #include "ui/aura/client/focus_client.h"	12 #include "ui/aura/client/focus_client.h"

13 #include "ui/aura/window_event_dispatcher.h"	13 #include "ui/aura/window_event_dispatcher.h"

14 #include "ui/aura/window_property.h"	14 #include "ui/aura/window_property.h"

15 #include "ui/base/cursor/cursor_loader_win.h"	15 #include "ui/base/cursor/cursor_loader_win.h"

16 #include "ui/base/ime/input_method.h"	16 #include "ui/base/ime/input_method.h"

17 #include "ui/base/win/shell.h"	17 #include "ui/base/win/shell.h"

18 #include "ui/compositor/compositor_constants.h"	18 #include "ui/compositor/compositor_constants.h"

19 #include "ui/compositor/paint_context.h"	19 #include "ui/compositor/paint_context.h"

20 #include "ui/gfx/geometry/insets.h"	20 #include "ui/gfx/geometry/insets.h"

21 #include "ui/gfx/geometry/vector2d.h"	21 #include "ui/gfx/geometry/vector2d.h"

22 #include "ui/gfx/native_widget_types.h"	22 #include "ui/gfx/native_widget_types.h"

23 #include "ui/gfx/path.h"	23 #include "ui/gfx/path.h"

24 #include "ui/gfx/path_win.h"	24 #include "ui/gfx/path_win.h"

25 #include "ui/gfx/win/dpi.h"	25 #include "ui/gfx/win/dpi.h"

26 #include "ui/native_theme/native_theme_aura.h"	26 #include "ui/native_theme/native_theme_aura.h"

27 #include "ui/native_theme/native_theme_win.h"	27 #include "ui/native_theme/native_theme_win.h"

28 #include "ui/views/corewm/tooltip_win.h"	28 #include "ui/views/corewm/tooltip_win.h"

29 #include "ui/views/ime/input_method_bridge.h"

30 #include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater.h"	29 #include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater.h"

31 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h"	30 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h"

32 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h"	31 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h"

33 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"	32 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"

34 #include "ui/views/widget/root_view.h"	33 #include "ui/views/widget/root_view.h"

35 #include "ui/views/widget/widget_delegate.h"	34 #include "ui/views/widget/widget_delegate.h"

36 #include "ui/views/widget/widget_hwnd_utils.h"	35 #include "ui/views/widget/widget_hwnd_utils.h"

37 #include "ui/views/win/fullscreen_handler.h"	36 #include "ui/views/win/fullscreen_handler.h"

38 #include "ui/views/win/hwnd_message_handler.h"	37 #include "ui/views/win/hwnd_message_handler.h"

39 #include "ui/views/win/hwnd_util.h"	38 #include "ui/views/win/hwnd_util.h"

(...skipping 911 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
951	950

952 // static	951 // static

953 DesktopWindowTreeHost* DesktopWindowTreeHost::Create(	952 DesktopWindowTreeHost* DesktopWindowTreeHost::Create(

954 internal::NativeWidgetDelegate* native_widget_delegate,	953 internal::NativeWidgetDelegate* native_widget_delegate,

955 DesktopNativeWidgetAura* desktop_native_widget_aura) {	954 DesktopNativeWidgetAura* desktop_native_widget_aura) {

956 return new DesktopWindowTreeHostWin(native_widget_delegate,	955 return new DesktopWindowTreeHostWin(native_widget_delegate,

957 desktop_native_widget_aura);	956 desktop_native_widget_aura);

958 }	957 }

959	958

960 } // namespace views	959 } // namespace views

OLD	NEW