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

Unified Diff: content/browser/web_contents/render_view_host_manager.cc

Issue 11000027: Rename GetSite in SiteInstance to GetSiteURL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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/web_contents/render_view_host_manager.cc
diff --git a/content/browser/web_contents/render_view_host_manager.cc b/content/browser/web_contents/render_view_host_manager.cc
index f858c4930c3faca9ad67263f4b5d72506b17ce85..c6608036401f092cc8e8a2d74b606eac80265575 100644
--- a/content/browser/web_contents/render_view_host_manager.cc
+++ b/content/browser/web_contents/render_view_host_manager.cc
@@ -406,7 +406,7 @@ bool RenderViewHostManager::ShouldSwapProcessesForNavigation(
// page and one isn't. If there's no curr_entry, check the current RVH's
// site, which might already be committed to a Web UI URL (such as the NTP).
const GURL& current_url = (curr_entry) ? curr_entry->GetURL() :
- render_view_host_->GetSiteInstance()->GetSite();
+ render_view_host_->GetSiteInstance()->GetSiteURL();
content::BrowserContext* browser_context =
delegate_->GetControllerForRenderManager().GetBrowserContext();
const WebUIControllerFactory* web_ui_factory =
@@ -577,7 +577,7 @@ SiteInstance* RenderViewHostManager::GetSiteInstanceForEntry(
// the page to a different same-site URL. (This seems very unlikely in
// practice.)
const GURL& current_url = (curr_entry) ? curr_entry->GetURL() :
- curr_instance->GetSite();
+ curr_instance->GetSiteURL();
// View-source URLs must use a new SiteInstance and BrowsingInstance.
// TODO(creis): Refactor this method so this duplicated code isn't needed.
@@ -798,7 +798,7 @@ RenderViewHostImpl* RenderViewHostManager::UpdateRendererStateForNavigate(
SiteInstance* new_instance = curr_instance;
const content::NavigationEntry* curr_entry =
delegate_->GetLastCommittedNavigationEntryForRenderManager();
- bool is_guest_scheme = curr_instance->GetSite().SchemeIs(
+ bool is_guest_scheme = curr_instance->GetSiteURL().SchemeIs(
chrome::kGuestScheme);
bool force_swap = ShouldSwapProcessesForNavigation(curr_entry, &entry);
if (!is_guest_scheme && (ShouldTransitionCrossSite() || force_swap))

Powered by Google App Engine
This is Rietveld 408576698