diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 23:49:14 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 23:49:14 +0000 |
| commit | 1af1dfeff5d142a28b69906ac544be6675e6bf7a (patch) | |
| tree | 6632302596e91b37cf740f52eefed41d9e2233de /chrome/browser/browser_about_handler.cc | |
| parent | 8bbc466e17e93268b724bae1732e33a0b34c28c8 (diff) | |
| download | chromium_src-1af1dfeff5d142a28b69906ac544be6675e6bf7a.zip chromium_src-1af1dfeff5d142a28b69906ac544be6675e6bf7a.tar.gz chromium_src-1af1dfeff5d142a28b69906ac544be6675e6bf7a.tar.bz2 | |
Enable about:flags in ChromeOS, part 1
BUG=57634
TEST=Go to about:flags in ChromeOS. It should appear.
Review URL: http://codereview.chromium.org/3896001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63137 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_about_handler.cc')
| -rw-r--r-- | chrome/browser/browser_about_handler.cc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 38f27a6..2babe90 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -260,8 +260,6 @@ std::string AboutAbout() { html.append("<html><head><title>About Pages</title></head><body>\n"); html.append("<h2>List of About pages</h2><ul>\n"); for (size_t i = 0; i < arraysize(kAllAboutPaths); i++) { - if (kAllAboutPaths[i] == kFlagsPath && !about_flags::IsEnabled()) - continue; if (kAllAboutPaths[i] == kAppCacheInternalsPath || kAllAboutPaths[i] == kBlobInternalsPath || kAllAboutPaths[i] == kCachePath || @@ -1087,13 +1085,11 @@ bool WillHandleBrowserAboutURL(GURL* url, Profile* profile) { return true; } - if (about_flags::IsEnabled()) { - // Rewrite about:flags and about:vaporware to chrome://flags/. - if (LowerCaseEqualsASCII(url->spec(), chrome::kAboutFlagsURL) || - LowerCaseEqualsASCII(url->spec(), chrome::kAboutVaporwareURL)) { - *url = GURL(chrome::kChromeUIFlagsURL); - return true; - } + // Rewrite about:flags and about:vaporware to chrome://flags/. + if (LowerCaseEqualsASCII(url->spec(), chrome::kAboutFlagsURL) || + LowerCaseEqualsASCII(url->spec(), chrome::kAboutVaporwareURL)) { + *url = GURL(chrome::kChromeUIFlagsURL); + return true; } // Rewrite about:net-internals/* URLs to chrome://net-internals/* |