Index: chrome/browser/ui/browser.h |
=================================================================== |
--- chrome/browser/ui/browser.h (revision 118952) |
+++ chrome/browser/ui/browser.h (working copy) |
@@ -774,7 +774,7 @@ |
// all its supporting objects and observers. |
static TabContentsWrapper* |
TabContentsFactory(Profile* profile, |
- SiteInstance* site_instance, |
+ content::SiteInstance* site_instance, |
int routing_id, |
const content::WebContents* base_web_contents, |
SessionStorageNamespace* session_storage_namespace); |
@@ -800,7 +800,7 @@ |
Profile* profile, |
content::PageTransition transition, |
bool defer_load, |
- SiteInstance* instance) const; |
+ content::SiteInstance* instance) const; |
virtual bool CanDuplicateContentsAt(int index); |
virtual void DuplicateContentsAt(int index); |
virtual void CloseFrameAfterDragSession(); |
@@ -1293,7 +1293,7 @@ |
// Creates a BackgroundContents if appropriate; return true if one was |
// created. |
bool MaybeCreateBackgroundContents(int route_id, |
- SiteInstance* site, |
+ content::SiteInstance* site, |
const GURL& opener_url, |
const string16& frame_name); |