Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(704)

Unified Diff: content/browser/tab_contents/navigation_entry_impl.h

Issue 9146028: Define the public interface for content browser SiteInstance. This interface is implemented by th... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/tab_contents/navigation_entry_impl.h
===================================================================
--- content/browser/tab_contents/navigation_entry_impl.h (revision 118952)
+++ content/browser/tab_contents/navigation_entry_impl.h (working copy)
@@ -8,13 +8,12 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
+#include "content/browser/site_instance_impl.h"
#include "content/public/browser/favicon_status.h"
#include "content/public/browser/global_request_id.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/ssl_status.h"
-class SiteInstance;
-
namespace content {
class CONTENT_EXPORT NavigationEntryImpl
@@ -23,7 +22,7 @@
static NavigationEntryImpl* FromNavigationEntry(NavigationEntry* entry);
NavigationEntryImpl();
- NavigationEntryImpl(SiteInstance* instance,
+ NavigationEntryImpl(SiteInstanceImpl* instance,
int page_id,
const GURL& url,
const Referrer& referrer,
@@ -71,9 +70,9 @@
// Note that the SiteInstance should usually not be changed after it is set,
// but this may happen if the NavigationEntry was cloned and needs to use a
// different SiteInstance.
- void set_site_instance(SiteInstance* site_instance);
- SiteInstance* site_instance() const {
- return site_instance_;
+ void set_site_instance(SiteInstanceImpl* site_instance);
+ SiteInstanceImpl* site_instance() const {
+ return site_instance_.get();
}
void set_page_type(PageType page_type) {
@@ -152,7 +151,7 @@
// See the accessors above for descriptions.
int unique_id_;
- scoped_refptr<SiteInstance> site_instance_;
+ scoped_refptr<SiteInstanceImpl> site_instance_;
PageType page_type_;
GURL url_;
Referrer referrer_;

Powered by Google App Engine
This is Rietveld 408576698