Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1847)

Unified Diff: content/browser/tab_contents/tab_contents.cc

Issue 8515027: Define the public version of the browser side RenderProcessHost interface. This interface is not ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/tab_contents/tab_contents.h ('k') | content/browser/webui/web_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tab_contents/tab_contents.cc
===================================================================
--- content/browser/tab_contents/tab_contents.cc (revision 110571)
+++ content/browser/tab_contents/tab_contents.cc (working copy)
@@ -22,7 +22,7 @@
#include "content/browser/in_process_webkit/session_storage_namespace.h"
#include "content/browser/load_from_memory_cache_details.h"
#include "content/browser/load_notification_details.h"
-#include "content/browser/renderer_host/render_process_host.h"
+#include "content/browser/renderer_host/render_process_host_impl.h"
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/renderer_host/render_widget_host_view.h"
#include "content/browser/renderer_host/resource_dispatcher_host.h"
@@ -326,7 +326,7 @@
delegate()->RunFileChooser(this, params);
}
-RenderProcessHost* TabContents::GetRenderProcessHost() const {
+content::RenderProcessHost* TabContents::GetRenderProcessHost() const {
if (render_manager_.current_host())
return render_manager_.current_host()->process();
else
@@ -846,7 +846,7 @@
double zoom_level;
if (temporary_zoom_settings_) {
zoom_level = zoom_map->GetTemporaryZoomLevel(
- GetRenderProcessHost()->id(), render_view_host()->routing_id());
+ GetRenderProcessHost()->GetID(), render_view_host()->routing_id());
} else {
GURL url;
NavigationEntry* active_entry = controller().GetActiveEntry();
@@ -914,7 +914,7 @@
bool is_error_page = (url.spec() == chrome::kUnreachableWebDataURL);
GURL validated_url(url);
render_view_host()->FilterURL(ChildProcessSecurityPolicy::GetInstance(),
- GetRenderProcessHost()->id(), &validated_url);
+ GetRenderProcessHost()->GetID(), &validated_url);
RenderViewHost* rvh =
render_manager_.pending_render_view_host() ?
@@ -963,7 +963,7 @@
<< ", frame_id: " << params.frame_id;
GURL validated_url(params.url);
render_view_host()->FilterURL(ChildProcessSecurityPolicy::GetInstance(),
- GetRenderProcessHost()->id(), &validated_url);
+ GetRenderProcessHost()->GetID(), &validated_url);
if (net::ERR_ABORTED == params.error_code) {
// EVIL HACK ALERT! Ignore failed loads when we're showing interstitials.
@@ -1045,7 +1045,7 @@
&cert_id, &cert_status,
&security_bits,
&connection_status);
- LoadFromMemoryCacheDetails details(url, GetRenderProcessHost()->id(),
+ LoadFromMemoryCacheDetails details(url, GetRenderProcessHost()->GetID(),
cert_id, cert_status);
content::NotificationService::current()->Notify(
« no previous file with comments | « content/browser/tab_contents/tab_contents.h ('k') | content/browser/webui/web_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698