content/browser/frame_host/navigator_impl.cc - Issue 328713006: Merge 275988 "Move about://-related constants from //content to ..."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/frame_host/navigator_impl.cc

Issue 328713006: Merge 275988 "Move about://-related constants from //content to ..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2042/src/

Patch Set: Created 6 years, 6 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

« no previous file with comments | « content/browser/frame_host/navigation_controller_impl_unittest.cc ('k') | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/navigator_impl.cc

===================================================================

--- content/browser/frame_host/navigator_impl.cc (revision 276109)

+++ content/browser/frame_host/navigator_impl.cc (working copy)

@@ -543,7 +543,7 @@

bool NavigatorImpl::ShouldAssignSiteForURL(const GURL& url) {

// about:blank should not "use up" a new SiteInstance. The SiteInstance can

// still be used for a normal web site.

- if (url == GURL(kAboutBlankURL))

+ if (url == GURL(url::kAboutBlankURL))

return false;

// The embedder will then have the opportunity to determine if the URL

@@ -596,7 +596,7 @@

GetSiteInstance();

if (!GetContentClient()->browser()->ShouldAllowOpenURL(

current_site_instance, url)) {

- dest_url = GURL(kAboutBlankURL);

+ dest_url = GURL(url::kAboutBlankURL);

}

int64 frame_tree_node_id = -1;