| OLD | NEW |
| 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/web_contents/web_contents_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
| (...skipping 3373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3384 void WebContentsImpl::NotifySwappedFromRenderManager(RenderViewHost* rvh) { | 3384 void WebContentsImpl::NotifySwappedFromRenderManager(RenderViewHost* rvh) { |
| 3385 NotifySwapped(rvh); | 3385 NotifySwapped(rvh); |
| 3386 | 3386 |
| 3387 // Make sure the visible RVH reflects the new delegate's preferences. | 3387 // Make sure the visible RVH reflects the new delegate's preferences. |
| 3388 if (delegate_) { | 3388 if (delegate_) { |
| 3389 RenderViewHostImpl* host = render_manager_.current_host(); | 3389 RenderViewHostImpl* host = render_manager_.current_host(); |
| 3390 if (host) | 3390 if (host) |
| 3391 host->SetOverscrollControllerEnabled(delegate_->CanOverscrollContent()); | 3391 host->SetOverscrollControllerEnabled(delegate_->CanOverscrollContent()); |
| 3392 } | 3392 } |
| 3393 | 3393 |
| 3394 view_->RenderViewSwappedIn(render_manager_.current_host()); | 3394 view_->RenderViewSwappedIn(render_manager_.current_host(), rvh); |
| 3395 } | 3395 } |
| 3396 | 3396 |
| 3397 int WebContentsImpl::CreateOpenerRenderViewsForRenderManager( | 3397 int WebContentsImpl::CreateOpenerRenderViewsForRenderManager( |
| 3398 SiteInstance* instance) { | 3398 SiteInstance* instance) { |
| 3399 if (!opener_) | 3399 if (!opener_) |
| 3400 return MSG_ROUTING_NONE; | 3400 return MSG_ROUTING_NONE; |
| 3401 | 3401 |
| 3402 // Recursively create RenderViews for anything else in the opener chain. | 3402 // Recursively create RenderViews for anything else in the opener chain. |
| 3403 return opener_->CreateOpenerRenderViews(instance); | 3403 return opener_->CreateOpenerRenderViews(instance); |
| 3404 } | 3404 } |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3536 | 3536 |
| 3537 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() const { | 3537 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() const { |
| 3538 return browser_plugin_guest_.get(); | 3538 return browser_plugin_guest_.get(); |
| 3539 } | 3539 } |
| 3540 | 3540 |
| 3541 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() const { | 3541 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() const { |
| 3542 return browser_plugin_embedder_.get(); | 3542 return browser_plugin_embedder_.get(); |
| 3543 } | 3543 } |
| 3544 | 3544 |
| 3545 } // namespace content | 3545 } // namespace content |
| OLD | NEW |