summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-16 18:31:26 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-16 18:31:26 +0000
commit8c8657d61fb8792985888c88730b2eb2f4fc4019 (patch)
tree73f4290e22afe39a19d64a0792a5a2ff2740a32c /chrome/browser/tab_contents
parent52ef74f432e2fb08be4f7ea323244884894fc656 (diff)
downloadchromium_src-8c8657d61fb8792985888c88730b2eb2f4fc4019.zip
chromium_src-8c8657d61fb8792985888c88730b2eb2f4fc4019.tar.gz
chromium_src-8c8657d61fb8792985888c88730b2eb2f4fc4019.tar.bz2
Move functions required by the rest of the browser from RenderProcessHost to an interface and move the implementation to BrowserRenderProcessHost. This will allow me to write render view unit tests without using the actual renderer, but there are no tests yet.
Review URL: http://codereview.chromium.org/18132 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8188 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
-rw-r--r--chrome/browser/tab_contents/navigation_entry.h1
-rw-r--r--chrome/browser/tab_contents/site_instance.cc3
-rw-r--r--chrome/browser/tab_contents/site_instance.h9
-rw-r--r--chrome/browser/tab_contents/tab_contents_factory.cc2
-rw-r--r--chrome/browser/tab_contents/tab_util.cc2
5 files changed, 9 insertions, 8 deletions
diff --git a/chrome/browser/tab_contents/navigation_entry.h b/chrome/browser/tab_contents/navigation_entry.h
index 3ffbfdb..7e6b1f3 100644
--- a/chrome/browser/tab_contents/navigation_entry.h
+++ b/chrome/browser/tab_contents/navigation_entry.h
@@ -7,6 +7,7 @@
#include "base/basictypes.h"
#include "base/scoped_ptr.h"
+#include "base/string_util.h"
#include "chrome/app/theme/theme_resources.h"
#include "chrome/browser/security_style.h"
#include "chrome/browser/tab_contents/site_instance.h"
diff --git a/chrome/browser/tab_contents/site_instance.cc b/chrome/browser/tab_contents/site_instance.cc
index a303f85..71a171e 100644
--- a/chrome/browser/tab_contents/site_instance.cc
+++ b/chrome/browser/tab_contents/site_instance.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/tab_contents/site_instance.h"
+#include "chrome/browser/renderer_host/browser_render_process_host.h"
#include "net/base/registry_controlled_domain.h"
SiteInstance::~SiteInstance() {
@@ -28,7 +29,7 @@ RenderProcessHost* SiteInstance::GetProcess() {
// Otherwise (or if that fails), create a new one.
if (!process)
- process = new RenderProcessHost(browsing_instance_->profile());
+ process = new BrowserRenderProcessHost(browsing_instance_->profile());
// Update our host ID, so all pages in this SiteInstance will use
// the correct process.
diff --git a/chrome/browser/tab_contents/site_instance.h b/chrome/browser/tab_contents/site_instance.h
index 6759fe3..b0aa3ed 100644
--- a/chrome/browser/tab_contents/site_instance.h
+++ b/chrome/browser/tab_contents/site_instance.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_SITE_INSTANCE_H__
-#define CHROME_BROWSER_SITE_INSTANCE_H__
+#ifndef CHROME_BROWSER_SITE_INSTANCE_H_
+#define CHROME_BROWSER_SITE_INSTANCE_H_
#include "chrome/browser/browsing_instance.h"
-#include "chrome/browser/render_process_host.h"
+#include "chrome/browser/renderer_host/render_process_host.h"
#include "googleurl/src/gurl.h"
///////////////////////////////////////////////////////////////////////////////
@@ -152,5 +152,4 @@ class SiteInstance : public base::RefCounted<SiteInstance> {
DISALLOW_EVIL_CONSTRUCTORS(SiteInstance);
};
-#endif // CHROME_BROWSER_SITE_INSTANCE_H__
-
+#endif // CHROME_BROWSER_SITE_INSTANCE_H_
diff --git a/chrome/browser/tab_contents/tab_contents_factory.cc b/chrome/browser/tab_contents/tab_contents_factory.cc
index 5151555..9a8aefe 100644
--- a/chrome/browser/tab_contents/tab_contents_factory.cc
+++ b/chrome/browser/tab_contents/tab_contents_factory.cc
@@ -9,7 +9,7 @@
#include "chrome/browser/dom_ui/html_dialog_contents.h"
#include "chrome/browser/dom_ui/new_tab_ui.h"
#include "chrome/browser/profile.h"
-#include "chrome/browser/render_process_host.h"
+#include "chrome/browser/renderer_host/render_process_host.h"
#include "chrome/browser/debugger/debugger_contents.h"
#include "chrome/browser/tab_contents/about_internets_status_view.h"
#include "chrome/browser/tab_contents/ipc_status_view.h"
diff --git a/chrome/browser/tab_contents/tab_util.cc b/chrome/browser/tab_contents/tab_util.cc
index a1a2f4e..8cea595 100644
--- a/chrome/browser/tab_contents/tab_util.cc
+++ b/chrome/browser/tab_contents/tab_util.cc
@@ -5,7 +5,7 @@
#include "chrome/browser/tab_contents/tab_util.h"
#include "chrome/browser/render_view_host.h"
-#include "chrome/browser/render_process_host.h"
+#include "chrome/browser/renderer_host/render_process_host.h"
#include "chrome/browser/renderer_host/resource_dispatcher_host.h"
#include "chrome/browser/tab_contents/web_contents.h"
#include "net/url_request/url_request.h"