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

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

Issue 23604019: reorder RenderWidgetHostViewPort::TextInputTypeChanged argument (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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
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 "base/bind_helpers.h" 5 #include "base/bind_helpers.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "content/browser/browser_plugin/browser_plugin_guest.h" 9 #include "content/browser/browser_plugin/browser_plugin_guest.h"
10 #include "content/browser/renderer_host/render_view_host_impl.h" 10 #include "content/browser/renderer_host/render_view_host_impl.h"
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 void RenderWidgetHostViewGuest::UpdateCursor(const WebCursor& cursor) { 282 void RenderWidgetHostViewGuest::UpdateCursor(const WebCursor& cursor) {
283 platform_view_->UpdateCursor(cursor); 283 platform_view_->UpdateCursor(cursor);
284 } 284 }
285 285
286 void RenderWidgetHostViewGuest::SetIsLoading(bool is_loading) { 286 void RenderWidgetHostViewGuest::SetIsLoading(bool is_loading) {
287 platform_view_->SetIsLoading(is_loading); 287 platform_view_->SetIsLoading(is_loading);
288 } 288 }
289 289
290 void RenderWidgetHostViewGuest::TextInputTypeChanged( 290 void RenderWidgetHostViewGuest::TextInputTypeChanged(
291 ui::TextInputType type, 291 ui::TextInputType type,
292 bool can_compose_inline, 292 ui::TextInputMode input_mode,
293 ui::TextInputMode input_mode) { 293 bool can_compose_inline) {
294 RenderWidgetHostViewPort::FromRWHV( 294 RenderWidgetHostViewPort::FromRWHV(
295 guest_->GetEmbedderRenderWidgetHostView())-> 295 guest_->GetEmbedderRenderWidgetHostView())->
296 TextInputTypeChanged(type, can_compose_inline, input_mode); 296 TextInputTypeChanged(type, input_mode, can_compose_inline);
297 } 297 }
298 298
299 void RenderWidgetHostViewGuest::ImeCancelComposition() { 299 void RenderWidgetHostViewGuest::ImeCancelComposition() {
300 platform_view_->ImeCancelComposition(); 300 platform_view_->ImeCancelComposition();
301 } 301 }
302 302
303 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(USE_AURA) 303 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(USE_AURA)
304 void RenderWidgetHostViewGuest::ImeCompositionRangeChanged( 304 void RenderWidgetHostViewGuest::ImeCompositionRangeChanged(
305 const ui::Range& range, 305 const ui::Range& range,
306 const std::vector<gfx::Rect>& character_bounds) { 306 const std::vector<gfx::Rect>& character_bounds) {
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 return; 576 return;
577 for (ui::GestureRecognizer::Gestures::iterator g_it = gestures->begin(); 577 for (ui::GestureRecognizer::Gestures::iterator g_it = gestures->begin();
578 g_it != gestures->end(); 578 g_it != gestures->end();
579 ++g_it) { 579 ++g_it) {
580 ForwardGestureEventToRenderer(*g_it); 580 ForwardGestureEventToRenderer(*g_it);
581 } 581 }
582 } 582 }
583 583
584 584
585 } // namespace content 585 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698