Chromium Code Reviews| Index: content/browser/frame_host/render_widget_host_view_child_frame.cc | 
| diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.cc b/content/browser/frame_host/render_widget_host_view_child_frame.cc | 
| index b8fdb0193d5800ad2867f95a5c1dc74014bf1828..257321196323c8f04055da865dde1e3346849c13 100644 | 
| --- a/content/browser/frame_host/render_widget_host_view_child_frame.cc | 
| +++ b/content/browser/frame_host/render_widget_host_view_child_frame.cc | 
| @@ -4,12 +4,16 @@ | 
| #include "content/browser/frame_host/render_widget_host_view_child_frame.h" | 
| +#include "base/command_line.h" | 
| #include "content/browser/accessibility/browser_accessibility_manager.h" | 
| +#include "content/browser/browser_plugin/browser_plugin_guest.h" | 
| #include "content/browser/frame_host/cross_process_frame_connector.h" | 
| +#include "content/browser/renderer_host/render_view_host_impl.h" | 
| #include "content/browser/renderer_host/render_widget_host_impl.h" | 
| #include "content/common/gpu/gpu_messages.h" | 
| #include "content/common/view_messages.h" | 
| #include "content/public/browser/render_process_host.h" | 
| +#include "content/public/common/content_switches.h" | 
| namespace content { | 
| @@ -134,6 +138,14 @@ void RenderWidgetHostViewChildFrame::UpdateCursor(const WebCursor& cursor) { | 
| } | 
| void RenderWidgetHostViewChildFrame::SetIsLoading(bool is_loading) { | 
| + // Inner WebContents reaches this, so skip the NOTREACHED() check below. | 
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 
| + switches::kSitePerProcess) && | 
| + BrowserPluginGuest::IsGuest( | 
| + static_cast<RenderViewHostImpl*>(RenderViewHost::From(host_)))) { | 
| 
 
nasko
2015/05/28 22:13:46
Why static cast? Just call RenderViewHostImpl::Fro
 
lazyboy
2015/05/29 00:02:24
I need From() not FromID(), did you want me to do
 
 | 
| + return; | 
| + } | 
| + | 
| NOTREACHED(); | 
| } |