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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 325443002: Move about://-related constants from //content to //url (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Android ifx 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/public/test/content_browser_test.cc ('k') | content/renderer/resource_fetcher_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 1866bb8b33105056a6b1fbb2698d9010aef8f515..d1670781a074321eb37debcfa9944737bab9ac23 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -200,7 +200,7 @@ WebURLResponseExtraDataImpl* GetExtraDataFromResponse(
void GetRedirectChain(WebDataSource* ds, std::vector<GURL>* result) {
// Replace any occurrences of swappedout:// with about:blank.
- const WebURL& blank_url = GURL(kAboutBlankURL);
+ const WebURL& blank_url = GURL(url::kAboutBlankURL);
WebVector<WebURL> urls;
ds->redirectChain(urls);
result->reserve(urls.size());
@@ -2042,7 +2042,7 @@ void RenderFrameImpl::didCreateDocumentElement(blink::WebLocalFrame* frame) {
// Notify the browser about non-blank documents loading in the top frame.
GURL url = frame->document().url();
- if (url.is_valid() && url.spec() != kAboutBlankURL) {
+ if (url.is_valid() && url.spec() != url::kAboutBlankURL) {
// TODO(nasko): Check if webview()->mainFrame() is the same as the
// frame->tree()->top().
blink::WebFrame* main_frame = render_view_->webview()->mainFrame();
@@ -3265,7 +3265,8 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
// browser process, and issue a special POST navigation in WebKit (via
// FrameLoader::loadFrameRequest). See ResourceDispatcher and WebURLLoaderImpl
// for examples of how to send the httpBody data.
- if (!frame->parent() && is_content_initiated && !url.SchemeIs(kAboutScheme)) {
+ if (!frame->parent() && is_content_initiated &&
+ !url.SchemeIs(url::kAboutScheme)) {
bool send_referrer = false;
// All navigations to or from WebUI URLs or within WebUI-enabled
@@ -3325,7 +3326,7 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
// (see below).
bool is_fork =
// Must start from a tab showing about:blank, which is later redirected.
- old_url == GURL(kAboutBlankURL) &&
+ old_url == GURL(url::kAboutBlankURL) &&
// Must be the first real navigation of the tab.
render_view_->historyBackListCount() < 1 &&
render_view_->historyForwardListCount() < 1 &&
« no previous file with comments | « content/public/test/content_browser_test.cc ('k') | content/renderer/resource_fetcher_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698