summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/tab_contents')
-rw-r--r--chrome/browser/tab_contents/tab_util.cc7
-rw-r--r--chrome/browser/tab_contents/tab_util.h3
2 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/tab_contents/tab_util.cc b/chrome/browser/tab_contents/tab_util.cc
index 3faf675..1c1300b 100644
--- a/chrome/browser/tab_contents/tab_util.cc
+++ b/chrome/browser/tab_contents/tab_util.cc
@@ -9,10 +9,13 @@
#include "chrome/browser/ui/webui/chrome_web_ui_factory.h"
#include "chrome/common/chrome_switches.h"
#include "content/browser/renderer_host/render_view_host.h"
+#include "content/browser/renderer_host/render_view_host_delegate.h"
#include "content/browser/site_instance.h"
-#include "content/browser/tab_contents/tab_contents.h"
+#include "content/public/browser/web_contents.h"
#include "googleurl/src/gurl.h"
+using content::WebContents;
+
namespace tab_util {
TabContents* GetTabContentsByID(int render_process_id, int render_view_id) {
@@ -34,7 +37,7 @@ content::WebContents* GetWebContentsByID(int render_process_id,
return render_view_host->delegate()->GetAsWebContents();
}
-SiteInstance* GetSiteInstanceForNewTab(TabContents* source_contents,
+SiteInstance* GetSiteInstanceForNewTab(WebContents* source_contents,
Profile* profile,
const GURL& url) {
// If url is a WebUI or extension, we need to be sure to use the right type
diff --git a/chrome/browser/tab_contents/tab_util.h b/chrome/browser/tab_contents/tab_util.h
index 63bcbfa..64f1aaf 100644
--- a/chrome/browser/tab_contents/tab_util.h
+++ b/chrome/browser/tab_contents/tab_util.h
@@ -10,7 +10,6 @@ class GURL;
class Profile;
class SiteInstance;
class TabContents;
-
namespace content {
class WebContents;
}
@@ -28,7 +27,7 @@ content::WebContents* GetWebContentsByID(int render_process_id,
// Returns a new SiteInstance for WebUI and app URLs. Returns the SiteInstance
// for |source_contents| if it represents the same website as |url|. Returns
// NULL otherwise.
-SiteInstance* GetSiteInstanceForNewTab(TabContents* source_contents,
+SiteInstance* GetSiteInstanceForNewTab(content::WebContents* source_contents,
Profile* profile,
const GURL& url);