Index: content/browser/tab_contents/navigation_entry_impl.cc |
=================================================================== |
--- content/browser/tab_contents/navigation_entry_impl.cc (revision 118703) |
+++ content/browser/tab_contents/navigation_entry_impl.cc (working copy) |
@@ -6,7 +6,6 @@ |
#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" |
@@ -46,7 +45,7 @@ |
is_renderer_initiated_(false) { |
} |
-NavigationEntryImpl::NavigationEntryImpl(SiteInstance* instance, |
+NavigationEntryImpl::NavigationEntryImpl(content::SiteInstance* instance, |
jam
2012/01/24 03:29:33
nit: this class should only be created by code in
ananta
2012/01/24 23:46:26
Done.
|
int page_id, |
const GURL& url, |
const Referrer& referrer, |
@@ -54,7 +53,7 @@ |
PageTransition transition_type, |
bool is_renderer_initiated) |
: unique_id_(GetUniqueIDInConstructor()), |
- site_instance_(instance), |
+ site_instance_(reinterpret_cast<SiteInstanceImpl*>(instance)), |
jam
2012/01/24 03:29:33
ditto
ananta
2012/01/24 23:46:26
Done.
|
page_type_(PAGE_TYPE_NORMAL), |
url_(url), |
referrer_(referrer), |
@@ -129,8 +128,9 @@ |
return page_id_; |
} |
-void NavigationEntryImpl::set_site_instance(SiteInstance* site_instance) { |
- site_instance_ = site_instance; |
+void NavigationEntryImpl::set_site_instance( |
+ content::SiteInstance* site_instance) { |
+ site_instance_ = reinterpret_cast<SiteInstanceImpl*>(site_instance); |
jam
2012/01/24 03:29:33
ditto
ananta
2012/01/24 23:46:26
Done.
|
} |
const string16& NavigationEntryImpl::GetTitleForDisplay( |