diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 22:13:48 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 22:13:48 +0000 |
| commit | dbdda5408e79f9b0a0936743f9c48ee258c08bf5 (patch) | |
| tree | 2ca96e9381018da170c7deb118193eda874046c3 /content/public | |
| parent | a014a131a2d903d21a311635c1ec40124d739815 (diff) | |
| download | chromium_src-dbdda5408e79f9b0a0936743f9c48ee258c08bf5.zip chromium_src-dbdda5408e79f9b0a0936743f9c48ee258c08bf5.tar.gz chromium_src-dbdda5408e79f9b0a0936743f9c48ee258c08bf5.tar.bz2 | |
content: Move kViewSourceScheme constant into content namespace.
BUG=None
R=thestig@chromium.org,grt@chromium.org,joi@chromium.org,eroman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/15950011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203241 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public')
| -rw-r--r-- | content/public/browser/web_contents_delegate.cc | 6 | ||||
| -rw-r--r-- | content/public/common/url_constants.cc | 4 | ||||
| -rw-r--r-- | content/public/common/url_constants.h | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc index 6150861..6026328 100644 --- a/content/public/browser/web_contents_delegate.cc +++ b/content/public/browser/web_contents_delegate.cc @@ -87,8 +87,7 @@ void WebContentsDelegate::ViewSourceForTab(WebContents* source, // Fall back implementation based entirely on the view-source scheme. // It suffers from http://crbug.com/523 and that is why browser overrides // it with proper implementation. - GURL url = GURL(chrome::kViewSourceScheme + std::string(":") + - page_url.spec()); + GURL url = GURL(kViewSourceScheme + std::string(":") + page_url.spec()); OpenURLFromTab(source, OpenURLParams(url, Referrer(), NEW_FOREGROUND_TAB, PAGE_TRANSITION_LINK, false)); @@ -98,8 +97,7 @@ void WebContentsDelegate::ViewSourceForFrame(WebContents* source, const GURL& frame_url, const PageState& page_state) { // Same as ViewSourceForTab, but for given subframe. - GURL url = GURL(chrome::kViewSourceScheme + std::string(":") + - frame_url.spec()); + GURL url = GURL(kViewSourceScheme + std::string(":") + frame_url.spec()); OpenURLFromTab(source, OpenURLParams(url, Referrer(), NEW_FOREGROUND_TAB, PAGE_TRANSITION_LINK, false)); diff --git a/content/public/common/url_constants.cc b/content/public/common/url_constants.cc index 1f458e6f..7cec38a 100644 --- a/content/public/common/url_constants.cc +++ b/content/public/common/url_constants.cc @@ -25,12 +25,12 @@ const char kJavaScriptScheme[] = "javascript"; const char kMailToScheme[] = "mailto"; const char kMetadataScheme[] = "metadata"; const char kSwappedOutScheme[] = "swappedout"; -const char kViewSourceScheme[] = "view-source"; - } // namespace chrome namespace content { +const char kViewSourceScheme[] = "view-source"; + const char kAboutBlankURL[] = "about:blank"; const char kAboutSrcDocURL[] = "about:srcdoc"; diff --git a/content/public/common/url_constants.h b/content/public/common/url_constants.h index e6ca477..58ee895 100644 --- a/content/public/common/url_constants.h +++ b/content/public/common/url_constants.h @@ -31,12 +31,12 @@ CONTENT_EXPORT extern const char kJavaScriptScheme[]; CONTENT_EXPORT extern const char kMailToScheme[]; CONTENT_EXPORT extern const char kMetadataScheme[]; CONTENT_EXPORT extern const char kSwappedOutScheme[]; -CONTENT_EXPORT extern const char kViewSourceScheme[]; - } // namespace chrome namespace content { +CONTENT_EXPORT extern const char kViewSourceScheme[]; + // Hosts for about URLs. CONTENT_EXPORT extern const char kAboutBlankURL[]; CONTENT_EXPORT extern const char kAboutSrcDocURL[]; |