Index: content/public/browser/web_contents.h |
=================================================================== |
--- content/public/browser/web_contents.h (revision 118703) |
+++ content/public/browser/web_contents.h (working copy) |
@@ -21,7 +21,6 @@ |
class RenderViewHost; |
class RenderWidgetHostView; |
class SessionStorageNamespace; |
-class SiteInstance; |
namespace base { |
class PropertyBag; |
@@ -44,6 +43,7 @@ |
class RenderProcessHost; |
class WebContentsDelegate; |
struct RendererPreferences; |
+class SiteInstance; |
struct SSLStatus; |
// TODO(jam): of course we will have to rename WebContentsView etc to use |
// WebContents. |
@@ -61,7 +61,7 @@ |
// pass in NULL which will cause a new SessionStorageNamespace to be created. |
CONTENT_EXPORT static WebContents* Create( |
BrowserContext* browser_context, |
- SiteInstance* site_instance, |
+ content::SiteInstance* site_instance, |
jam
2012/01/24 03:29:33
nit: here and below, no need for the "content::" s
ananta
2012/01/24 23:46:26
Done.
|
int routing_id, |
const WebContents* base_tab_contents, |
SessionStorageNamespace* session_storage_namespace); |
@@ -136,14 +136,15 @@ |
// The max page ID for any page that the given SiteInstance has loaded in |
// this TabContents. |
- virtual int32 GetMaxPageIDForSiteInstance(SiteInstance* site_instance) = 0; |
+ virtual int32 GetMaxPageIDForSiteInstance( |
+ content::SiteInstance* site_instance) = 0; |
// Returns the SiteInstance associated with the current page. |
- virtual SiteInstance* GetSiteInstance() const = 0; |
+ virtual content::SiteInstance* GetSiteInstance() const = 0; |
// Returns the SiteInstance for the pending navigation, if any. Otherwise |
// returns the current SiteInstance. |
- virtual SiteInstance* GetPendingSiteInstance() const = 0; |
+ virtual content::SiteInstance* GetPendingSiteInstance() const = 0; |
// Return whether this tab contents is loading a resource. |
virtual bool IsLoading() const = 0; |