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

Side by Side Diff: chrome/browser/renderer_host/render_widget_host_view_win.cc

Issue 2099012: Cancels an ongoing IME composition when receiving an IME_CANCEL_COMPOSITION e... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 7 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 | « chrome/browser/ime_input.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/browser/renderer_host/render_widget_host_view_win.h" 5 #include "chrome/browser/renderer_host/render_widget_host_view_win.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/l10n_util_win.h" 8 #include "app/l10n_util_win.h"
9 #include "app/resource_bundle.h" 9 #include "app/resource_bundle.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 607
608 void RenderWidgetHostViewWin::SetIsLoading(bool is_loading) { 608 void RenderWidgetHostViewWin::SetIsLoading(bool is_loading) {
609 is_loading_ = is_loading; 609 is_loading_ = is_loading;
610 UpdateCursorIfOverSelf(); 610 UpdateCursorIfOverSelf();
611 } 611 }
612 612
613 void RenderWidgetHostViewWin::IMEUpdateStatus(int control, 613 void RenderWidgetHostViewWin::IMEUpdateStatus(int control,
614 const gfx::Rect& caret_rect) { 614 const gfx::Rect& caret_rect) {
615 if (control == IME_DISABLE) { 615 if (control == IME_DISABLE) {
616 ime_input_.DisableIME(m_hWnd); 616 ime_input_.DisableIME(m_hWnd);
617 } else if (control == IME_CANCEL_COMPOSITION) {
618 ime_input_.CancelIME(m_hWnd);
617 } else { 619 } else {
618 ime_input_.EnableIME(m_hWnd, caret_rect, 620 ime_input_.EnableIME(m_hWnd, caret_rect,
619 control == IME_COMPLETE_COMPOSITION); 621 control == IME_COMPLETE_COMPOSITION);
620 } 622 }
621 } 623 }
622 624
623 BOOL CALLBACK EnumChildProc(HWND hwnd, LPARAM lparam) { 625 BOOL CALLBACK EnumChildProc(HWND hwnd, LPARAM lparam) {
624 if (!WebPluginDelegateImpl::IsPluginDelegateWindow(hwnd)) 626 if (!WebPluginDelegateImpl::IsPluginDelegateWindow(hwnd))
625 return TRUE; 627 return TRUE;
626 628
(...skipping 1021 matching lines...) Expand 10 before | Expand all | Expand 10 after
1648 RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView( 1650 RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView(
1649 gfx::NativeView native_view) { 1651 gfx::NativeView native_view) {
1650 if (::IsWindow(native_view)) { 1652 if (::IsWindow(native_view)) {
1651 HANDLE raw_render_host_view = ::GetProp(native_view, 1653 HANDLE raw_render_host_view = ::GetProp(native_view,
1652 kRenderWidgetHostViewKey); 1654 kRenderWidgetHostViewKey);
1653 if (raw_render_host_view) 1655 if (raw_render_host_view)
1654 return reinterpret_cast<RenderWidgetHostView*>(raw_render_host_view); 1656 return reinterpret_cast<RenderWidgetHostView*>(raw_render_host_view);
1655 } 1657 }
1656 return NULL; 1658 return NULL;
1657 } 1659 }
OLDNEW
« no previous file with comments | « chrome/browser/ime_input.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698