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/field_trial.h" | 10 #include "base/metrics/field_trial.h" |
(...skipping 3123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3134 } | 3134 } |
3135 | 3135 |
3136 WebPreferences WebContentsImpl::GetWebkitPrefs() { | 3136 WebPreferences WebContentsImpl::GetWebkitPrefs() { |
3137 // We want to base the page config off of the real URL, rather than the | 3137 // We want to base the page config off of the real URL, rather than the |
3138 // display URL. | 3138 // display URL. |
3139 GURL url = controller_.GetActiveEntry() | 3139 GURL url = controller_.GetActiveEntry() |
3140 ? controller_.GetActiveEntry()->GetURL() : GURL::EmptyGURL(); | 3140 ? controller_.GetActiveEntry()->GetURL() : GURL::EmptyGURL(); |
3141 return GetWebkitPrefs(GetRenderViewHost(), url); | 3141 return GetWebkitPrefs(GetRenderViewHost(), url); |
3142 } | 3142 } |
3143 | 3143 |
| 3144 int WebContentsImpl::CreateSwappedOutRenderView( |
| 3145 content::SiteInstance* instance) { |
| 3146 return render_manager_.CreateRenderView(instance, MSG_ROUTING_NONE, true); |
| 3147 } |
| 3148 |
3144 void WebContentsImpl::OnUserGesture() { | 3149 void WebContentsImpl::OnUserGesture() { |
3145 // Notify observers. | 3150 // Notify observers. |
3146 FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidGetUserGesture()); | 3151 FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidGetUserGesture()); |
3147 | 3152 |
3148 ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get(); | 3153 ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get(); |
3149 if (rdh) // NULL in unittests. | 3154 if (rdh) // NULL in unittests. |
3150 rdh->OnUserGesture(this); | 3155 rdh->OnUserGesture(this); |
3151 } | 3156 } |
3152 | 3157 |
3153 void WebContentsImpl::OnIgnoredUIEvent() { | 3158 void WebContentsImpl::OnIgnoredUIEvent() { |
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3413 } | 3418 } |
3414 } | 3419 } |
3415 | 3420 |
3416 content::BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() { | 3421 content::BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() { |
3417 return browser_plugin_guest_.get(); | 3422 return browser_plugin_guest_.get(); |
3418 } | 3423 } |
3419 | 3424 |
3420 content::BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() { | 3425 content::BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() { |
3421 return browser_plugin_embedder_.get(); | 3426 return browser_plugin_embedder_.get(); |
3422 } | 3427 } |
OLD | NEW |