Chromium Code Reviews| 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 "content/browser/frame_host/render_widget_host_view_guest.h" | 5 #include "content/browser/frame_host/render_widget_host_view_guest.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 399 // ViewHostMsg_SetCursor for interstitial pages in BrowserPluginGuest. | 399 // ViewHostMsg_SetCursor for interstitial pages in BrowserPluginGuest. |
| 400 // All guest RenderViewHosts have RenderWidgetHostViewGuests however, | 400 // All guest RenderViewHosts have RenderWidgetHostViewGuests however, |
| 401 // and so we will always hit this code path. | 401 // and so we will always hit this code path. |
| 402 if (!guest_) | 402 if (!guest_) |
| 403 return; | 403 return; |
| 404 if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) { | 404 if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) { |
| 405 RenderWidgetHostViewBase* rwhvb = GetOwnerRenderWidgetHostView(); | 405 RenderWidgetHostViewBase* rwhvb = GetOwnerRenderWidgetHostView(); |
| 406 if (rwhvb) | 406 if (rwhvb) |
| 407 rwhvb->UpdateCursor(cursor); | 407 rwhvb->UpdateCursor(cursor); |
| 408 } else { | 408 } else { |
| 409 guest_->SendMessageToEmbedder(new BrowserPluginMsg_SetCursor( | 409 guest_->SendMessageToEmbedder( |
| 410 guest_->browser_plugin_instance_id(), cursor)); | 410 base::WrapUnique(new BrowserPluginMsg_SetCursor( |
|
Avi (use Gerrit)
2016/10/20 15:08:12
MakeUnique
limasdf
2016/10/20 15:56:20
Done.
| |
| 411 guest_->browser_plugin_instance_id(), cursor))); | |
| 411 } | 412 } |
| 412 } | 413 } |
| 413 | 414 |
| 414 void RenderWidgetHostViewGuest::SetIsLoading(bool is_loading) { | 415 void RenderWidgetHostViewGuest::SetIsLoading(bool is_loading) { |
| 415 platform_view_->SetIsLoading(is_loading); | 416 platform_view_->SetIsLoading(is_loading); |
| 416 } | 417 } |
| 417 | 418 |
| 418 void RenderWidgetHostViewGuest::TextInputStateChanged( | 419 void RenderWidgetHostViewGuest::TextInputStateChanged( |
| 419 const TextInputState& params) { | 420 const TextInputState& params) { |
| 420 if (!guest_) | 421 if (!guest_) |
| (...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 689 gesture_event.data.scrollUpdate.inertialPhase == | 690 gesture_event.data.scrollUpdate.inertialPhase == |
| 690 blink::WebGestureEvent::MomentumPhase) { | 691 blink::WebGestureEvent::MomentumPhase) { |
| 691 return; | 692 return; |
| 692 } | 693 } |
| 693 host_->ForwardGestureEvent(gesture_event); | 694 host_->ForwardGestureEvent(gesture_event); |
| 694 return; | 695 return; |
| 695 } | 696 } |
| 696 } | 697 } |
| 697 | 698 |
| 698 } // namespace content | 699 } // namespace content |
| OLD | NEW |