diff options
| author | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-10 11:46:17 +0000 |
|---|---|---|
| committer | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-10 11:46:17 +0000 |
| commit | 8e09c7af875d86eb8174c5fb5a12ddec9ac8c38e (patch) | |
| tree | 0a680f2c9e86cd0c3152bbec6d9598a29e3b527d /chrome/browser/extensions/api/web_navigation | |
| parent | 073a4adbec38b7cc7d175e4b4b26d94832e0bcb1 (diff) | |
| download | chromium_src-8e09c7af875d86eb8174c5fb5a12ddec9ac8c38e.zip chromium_src-8e09c7af875d86eb8174c5fb5a12ddec9ac8c38e.tar.gz chromium_src-8e09c7af875d86eb8174c5fb5a12ddec9ac8c38e.tar.bz2 | |
Move about://-related constants from //content to //url
kAboutScheme and kAboutBlankURL are used in code shared by iOS, and are general
enough to live in //url instead of //content.
TBR=yoz,benm
Review URL: https://codereview.chromium.org/325443002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api/web_navigation')
| -rw-r--r-- | chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/extensions/api/web_navigation/web_navigation_api.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc index c322615..becb1ab 100644 --- a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc +++ b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc @@ -81,7 +81,7 @@ bool FrameNavigationState::IsValidUrl(const GURL& url) const { return true; } // Allow about:blank and about:srcdoc. - if (url.spec() == content::kAboutBlankURL || + if (url.spec() == url::kAboutBlankURL || url.spec() == content::kAboutSrcDocURL) { return true; } @@ -101,7 +101,7 @@ void FrameNavigationState::TrackFrame(FrameID frame_id, frame_state.url = url; frame_state.is_main_frame = is_main_frame; frame_state.is_iframe_srcdoc = is_iframe_srcdoc; - DCHECK(!is_iframe_srcdoc || url == GURL(content::kAboutBlankURL)); + DCHECK(!is_iframe_srcdoc || url == GURL(url::kAboutBlankURL)); frame_state.is_navigating = true; frame_state.is_committed = false; frame_state.is_server_redirected = false; diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc index 392d749..bbade50 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc @@ -537,7 +537,7 @@ void WebNavigationTabObserver::DidFinishLoad( DCHECK( navigation_state_.GetUrl(frame_id) == validated_url || (navigation_state_.GetUrl(frame_id) == GURL(content::kAboutSrcDocURL) && - validated_url == GURL(content::kAboutBlankURL))) + validated_url == GURL(url::kAboutBlankURL))) << "validated URL is " << validated_url << " but we expected " << navigation_state_.GetUrl(frame_id); DCHECK_EQ(navigation_state_.IsMainFrame(frame_id), is_main_frame); |