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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_base.cc

Issue 2098353005: Implement RenderWidgetHostViewBase::ImeCancelComposition for all Views (Aura Only) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
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 "content/browser/renderer_host/render_widget_host_view_base.h" 5 #include "content/browser/renderer_host/render_widget_host_view_base.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "content/browser/accessibility/browser_accessibility_manager.h" 9 #include "content/browser/accessibility/browser_accessibility_manager.h"
10 #include "content/browser/gpu/gpu_data_manager_impl.h" 10 #include "content/browser/gpu/gpu_data_manager_impl.h"
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 void RenderWidgetHostViewBase::TextInputStateChanged( 404 void RenderWidgetHostViewBase::TextInputStateChanged(
405 const TextInputState& text_input_state) { 405 const TextInputState& text_input_state) {
406 // TODO(ekaramad): Use TextInputManager code paths when IME is implemented on 406 // TODO(ekaramad): Use TextInputManager code paths when IME is implemented on
407 // other platforms. 407 // other platforms.
408 #if defined(USE_AURA) 408 #if defined(USE_AURA)
409 if (GetTextInputManager()) 409 if (GetTextInputManager())
410 GetTextInputManager()->UpdateTextInputState(this, text_input_state); 410 GetTextInputManager()->UpdateTextInputState(this, text_input_state);
411 #endif 411 #endif
412 } 412 }
413 413
414 void RenderWidgetHostViewBase::ImeCancelComposition() {
415 if (GetTextInputManager())
416 GetTextInputManager()->ImeCancelComposition(this);
kenrb 2016/06/28 15:12:41 I notice the method above this one has a USE_AURA
EhsanK 2016/06/28 16:41:19 We always create TextInputManager now which is on
417 }
418
414 TextInputManager* RenderWidgetHostViewBase::GetTextInputManager() { 419 TextInputManager* RenderWidgetHostViewBase::GetTextInputManager() {
415 if (text_input_manager_) 420 if (text_input_manager_)
416 return text_input_manager_; 421 return text_input_manager_;
417 422
418 RenderWidgetHostImpl* host = 423 RenderWidgetHostImpl* host =
419 RenderWidgetHostImpl::From(GetRenderWidgetHost()); 424 RenderWidgetHostImpl::From(GetRenderWidgetHost());
420 if (!host || !host->delegate()) 425 if (!host || !host->delegate())
421 return nullptr; 426 return nullptr;
422 427
423 // This RWHV needs to be registered with the TextInputManager so that the 428 // This RWHV needs to be registered with the TextInputManager so that the
(...skipping 17 matching lines...) Expand all
441 446
442 bool RenderWidgetHostViewBase::IsChildFrameForTesting() const { 447 bool RenderWidgetHostViewBase::IsChildFrameForTesting() const {
443 return false; 448 return false;
444 } 449 }
445 450
446 cc::SurfaceId RenderWidgetHostViewBase::SurfaceIdForTesting() const { 451 cc::SurfaceId RenderWidgetHostViewBase::SurfaceIdForTesting() const {
447 return cc::SurfaceId(); 452 return cc::SurfaceId();
448 } 453 }
449 454
450 } // namespace content 455 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_base.h ('k') | content/browser/renderer_host/text_input_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698