| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/frame_host/render_widget_host_view_guest.h" | 10 #include "content/browser/frame_host/render_widget_host_view_guest.h" |
| (...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 280 } | 280 } |
| 281 | 281 |
| 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::TextInputStateChanged( |
| 291 ui::TextInputType type, | 291 const ViewHostMsg_TextInputState_Params& params) { |
| 292 ui::TextInputMode input_mode, | |
| 293 bool can_compose_inline) { | |
| 294 if (!guest_) | 292 if (!guest_) |
| 295 return; | 293 return; |
| 296 | 294 |
| 297 RenderWidgetHostViewBase* rwhv = GetGuestRenderWidgetHostView(); | 295 RenderWidgetHostViewBase* rwhv = GetGuestRenderWidgetHostView(); |
| 298 if (!rwhv) | 296 if (!rwhv) |
| 299 return; | 297 return; |
| 300 // Forward the information to embedding RWHV. | 298 // Forward the information to embedding RWHV. |
| 301 rwhv->TextInputTypeChanged(type, input_mode, can_compose_inline); | 299 rwhv->TextInputStateChanged(params); |
| 302 } | 300 } |
| 303 | 301 |
| 304 void RenderWidgetHostViewGuest::ImeCancelComposition() { | 302 void RenderWidgetHostViewGuest::ImeCancelComposition() { |
| 305 if (!guest_) | 303 if (!guest_) |
| 306 return; | 304 return; |
| 307 | 305 |
| 308 RenderWidgetHostViewBase* rwhv = GetGuestRenderWidgetHostView(); | 306 RenderWidgetHostViewBase* rwhv = GetGuestRenderWidgetHostView(); |
| 309 if (!rwhv) | 307 if (!rwhv) |
| 310 return; | 308 return; |
| 311 // Forward the information to embedding RWHV. | 309 // Forward the information to embedding RWHV. |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 550 return SkBitmap::kARGB_8888_Config; | 548 return SkBitmap::kARGB_8888_Config; |
| 551 } | 549 } |
| 552 | 550 |
| 553 RenderWidgetHostViewBase* | 551 RenderWidgetHostViewBase* |
| 554 RenderWidgetHostViewGuest::GetGuestRenderWidgetHostView() const { | 552 RenderWidgetHostViewGuest::GetGuestRenderWidgetHostView() const { |
| 555 return static_cast<RenderWidgetHostViewBase*>( | 553 return static_cast<RenderWidgetHostViewBase*>( |
| 556 guest_->GetEmbedderRenderWidgetHostView()); | 554 guest_->GetEmbedderRenderWidgetHostView()); |
| 557 } | 555 } |
| 558 | 556 |
| 559 } // namespace content | 557 } // namespace content |
| OLD | NEW |