Index: content/browser/tab_contents/navigation_entry_impl.cc |
=================================================================== |
--- content/browser/tab_contents/navigation_entry_impl.cc (revision 118952) |
+++ content/browser/tab_contents/navigation_entry_impl.cc (working copy) |
@@ -6,12 +6,13 @@ |
#include "base/string_util.h" |
#include "base/utf_string_conversions.h" |
-#include "content/browser/site_instance.h" |
#include "content/public/common/content_constants.h" |
#include "content/public/common/url_constants.h" |
#include "net/base/net_util.h" |
#include "ui/base/text/text_elider.h" |
+using content::SiteInstance; |
+ |
// Use this to get a new unique ID for a NavigationEntry during construction. |
// The returned ID is guaranteed to be nonzero (which is the "no ID" indicator). |
static int GetUniqueIDInConstructor() { |
@@ -46,7 +47,7 @@ |
is_renderer_initiated_(false) { |
} |
-NavigationEntryImpl::NavigationEntryImpl(SiteInstance* instance, |
+NavigationEntryImpl::NavigationEntryImpl(SiteInstanceImpl* instance, |
int page_id, |
const GURL& url, |
const Referrer& referrer, |
@@ -129,7 +130,7 @@ |
return page_id_; |
} |
-void NavigationEntryImpl::set_site_instance(SiteInstance* site_instance) { |
+void NavigationEntryImpl::set_site_instance(SiteInstanceImpl* site_instance) { |
site_instance_ = site_instance; |
} |