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

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

Issue 149073009: Remove InputMethodTSF, TSFEventRouter, TSFTextStore, TSFBridge (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert input_method_imm32 changes Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « ui/base/ime/win/tsf_text_store_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_root_window_host_win.h" 5 #include "ui/views/widget/desktop_aura/desktop_root_window_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/client/scoped_tooltip_disabler.h" 13 #include "ui/aura/client/scoped_tooltip_disabler.h"
14 #include "ui/aura/root_window.h" 14 #include "ui/aura/root_window.h"
15 #include "ui/aura/window_property.h" 15 #include "ui/aura/window_property.h"
16 #include "ui/base/cursor/cursor_loader_win.h" 16 #include "ui/base/cursor/cursor_loader_win.h"
17 #include "ui/base/ime/input_method.h" 17 #include "ui/base/ime/input_method.h"
18 #include "ui/base/ime/win/tsf_bridge.h"
19 #include "ui/base/win/shell.h" 18 #include "ui/base/win/shell.h"
20 #include "ui/compositor/compositor_constants.h" 19 #include "ui/compositor/compositor_constants.h"
21 #include "ui/gfx/insets.h" 20 #include "ui/gfx/insets.h"
22 #include "ui/gfx/native_widget_types.h" 21 #include "ui/gfx/native_widget_types.h"
23 #include "ui/gfx/path.h" 22 #include "ui/gfx/path.h"
24 #include "ui/gfx/path_win.h" 23 #include "ui/gfx/path_win.h"
25 #include "ui/gfx/vector2d.h" 24 #include "ui/gfx/vector2d.h"
26 #include "ui/gfx/win/dpi.h" 25 #include "ui/gfx/win/dpi.h"
27 #include "ui/native_theme/native_theme_aura.h" 26 #include "ui/native_theme/native_theme_aura.h"
28 #include "ui/native_theme/native_theme_win.h" 27 #include "ui/native_theme/native_theme_win.h"
(...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after
840 } 839 }
841 840
842 void DesktopWindowTreeHostWin::HandleNativeBlur(HWND focused_window) { 841 void DesktopWindowTreeHostWin::HandleNativeBlur(HWND focused_window) {
843 // TODO(beng): inform the native_widget_delegate_. 842 // TODO(beng): inform the native_widget_delegate_.
844 InputMethod* input_method = GetInputMethod(); 843 InputMethod* input_method = GetInputMethod();
845 if (input_method) 844 if (input_method)
846 input_method->OnBlur(); 845 input_method->OnBlur();
847 } 846 }
848 847
849 bool DesktopWindowTreeHostWin::HandleMouseEvent(const ui::MouseEvent& event) { 848 bool DesktopWindowTreeHostWin::HandleMouseEvent(const ui::MouseEvent& event) {
850 if (base::win::IsTSFAwareRequired() && event.IsAnyButton())
851 ui::TSFBridge::GetInstance()->CancelComposition();
852 return delegate_->OnHostMouseEvent(const_cast<ui::MouseEvent*>(&event)); 849 return delegate_->OnHostMouseEvent(const_cast<ui::MouseEvent*>(&event));
853 } 850 }
854 851
855 bool DesktopWindowTreeHostWin::HandleKeyEvent(const ui::KeyEvent& event) { 852 bool DesktopWindowTreeHostWin::HandleKeyEvent(const ui::KeyEvent& event) {
856 return false; 853 return false;
857 } 854 }
858 855
859 bool DesktopWindowTreeHostWin::HandleUntranslatedKeyEvent( 856 bool DesktopWindowTreeHostWin::HandleUntranslatedKeyEvent(
860 const ui::KeyEvent& event) { 857 const ui::KeyEvent& event) {
861 ui::KeyEvent duplicate_event(event); 858 ui::KeyEvent duplicate_event(event);
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
1005 1002
1006 // static 1003 // static
1007 DesktopWindowTreeHost* DesktopWindowTreeHost::Create( 1004 DesktopWindowTreeHost* DesktopWindowTreeHost::Create(
1008 internal::NativeWidgetDelegate* native_widget_delegate, 1005 internal::NativeWidgetDelegate* native_widget_delegate,
1009 DesktopNativeWidgetAura* desktop_native_widget_aura) { 1006 DesktopNativeWidgetAura* desktop_native_widget_aura) {
1010 return new DesktopWindowTreeHostWin(native_widget_delegate, 1007 return new DesktopWindowTreeHostWin(native_widget_delegate,
1011 desktop_native_widget_aura); 1008 desktop_native_widget_aura);
1012 } 1009 }
1013 1010
1014 } // namespace views 1011 } // namespace views
OLDNEW
« no previous file with comments | « ui/base/ime/win/tsf_text_store_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698