Index: chrome/browser/ui/browser.cc |
=================================================================== |
--- chrome/browser/ui/browser.cc (revision 118703) |
+++ chrome/browser/ui/browser.cc (working copy) |
@@ -148,7 +148,6 @@ |
#include "content/browser/child_process_security_policy.h" |
#include "content/browser/host_zoom_map.h" |
#include "content/browser/renderer_host/render_view_host.h" |
-#include "content/browser/site_instance.h" |
#include "content/browser/tab_contents/interstitial_page.h" |
#include "content/public/browser/devtools_manager.h" |
#include "content/public/browser/download_item.h" |
@@ -159,6 +158,7 @@ |
#include "content/public/browser/notification_details.h" |
#include "content/public/browser/notification_service.h" |
#include "content/public/browser/plugin_service.h" |
+#include "content/public/browser/site_instance.h" |
#include "content/public/browser/user_metrics.h" |
#include "content/public/browser/web_contents.h" |
#include "content/public/browser/web_contents_view.h" |
@@ -2145,7 +2145,7 @@ |
} |
bool Browser::MaybeCreateBackgroundContents(int route_id, |
- SiteInstance* site, |
+ content::SiteInstance* site, |
const GURL& opener_url, |
const string16& frame_name) { |
ExtensionService* extensions_service = profile_->GetExtensionService(); |
@@ -3165,7 +3165,7 @@ |
TabContentsWrapper* Browser::CreateTabContentsForURL( |
const GURL& url, const content::Referrer& referrer, Profile* profile, |
content::PageTransition transition, bool defer_load, |
- SiteInstance* instance) const { |
+ content::SiteInstance* instance) const { |
TabContentsWrapper* contents = TabContentsFactory(profile, instance, |
MSG_ROUTING_NONE, |
GetSelectedWebContents(), NULL); |
@@ -5275,7 +5275,7 @@ |
// all its supporting objects and observers. |
TabContentsWrapper* Browser::TabContentsFactory( |
Profile* profile, |
- SiteInstance* site_instance, |
+ content::SiteInstance* site_instance, |
int routing_id, |
const WebContents* base_web_contents, |
SessionStorageNamespace* session_storage_namespace) { |