From ba86502bf6a9cc210d8604114a548e1feaf9a070 Mon Sep 17 00:00:00 2001 From: "msw@chromium.org" Date: Wed, 22 Jan 2014 01:42:22 +0000 Subject: [PATCH] Remove old about scheme URL constants. These are no longer needed after chrome frame's deletion. Use the equivalent chrome scheme URL constants instead. BUG=316496 TEST=NONE R=pkasting@chromium.org TBR=bauerb@chromium.org Review URL: https://codereview.chromium.org/137793017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246199 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/plugins/plugin_observer.cc | 2 +- chrome/browser/ui/browser_browsertest.cc | 4 ++-- chrome/common/url_constants.cc | 4 ---- chrome/common/url_constants.h | 4 ---- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/chrome/browser/plugins/plugin_observer.cc b/chrome/browser/plugins/plugin_observer.cc index b85e35c2a1ee..103435769dc9 100644 --- a/chrome/browser/plugins/plugin_observer.cc +++ b/chrome/browser/plugins/plugin_observer.cc @@ -372,7 +372,7 @@ void PluginObserver::OnRemovePluginPlaceholderHost(int placeholder_id) { void PluginObserver::OnOpenAboutPlugins() { web_contents()->OpenURL(OpenURLParams( - GURL(chrome::kAboutPluginsURL), + GURL(chrome::kChromeUIPluginsURL), content::Referrer(web_contents()->GetURL(), blink::WebReferrerPolicyDefault), NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_AUTO_BOOKMARK, false)); diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 1da959f8835f..1dd65dada30a 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -2213,9 +2213,9 @@ IN_PROC_BROWSER_TEST_F(AppModeTest, EnableAppModeTest) { EXPECT_TRUE(browser()->is_app()); } -// Confirm about:version contains some expected content. +// Confirm chrome://version contains some expected content. IN_PROC_BROWSER_TEST_F(BrowserTest, AboutVersion) { - ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutVersionURL)); + ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIVersionURL)); WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); ASSERT_GT(ui_test_utils::FindInPage(tab, ASCIIToUTF16("WebKit"), true, true, NULL, NULL), diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc index 9a2619424eaf..fdf66f3a5869 100644 --- a/chrome/common/url_constants.cc +++ b/chrome/common/url_constants.cc @@ -17,10 +17,6 @@ const char kCrosScheme[] = "cros"; const char kDriveScheme[] = "drive"; #endif -const char kAboutComponentsURL[] = "about:components"; -const char kAboutPluginsURL[] = "about:plugins"; -const char kAboutVersionURL[] = "about:version"; - // Add Chrome UI URLs as necessary, in alphabetical order. // Be sure to add the corresponding kChromeUI*Host constant below. // This is a WebUI page that lists other WebUI pages. diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h index a1f8e4fca8f9..a2ab454a2b00 100644 --- a/chrome/common/url_constants.h +++ b/chrome/common/url_constants.h @@ -15,10 +15,6 @@ namespace chrome { -extern const char kAboutComponentsURL[]; -extern const char kAboutPluginsURL[]; -extern const char kAboutVersionURL[]; - // chrome: URLs (including schemes). Should be kept in sync with the // components below. extern const char kChromeUIAboutURL[]; -- 2.11.4.GIT