summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-26 02:06:02 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-26 02:06:02 +0000
commit03fc700b3d295c057535b9e42c53c83df4409fb9 (patch)
tree1868e6e80d78fe08a3980c431d1fad5f282a6149 /chrome
parent56ba1c2f48dab0e3069108692352339ae99b11e0 (diff)
downloadchromium_src-03fc700b3d295c057535b9e42c53c83df4409fb9.zip
chromium_src-03fc700b3d295c057535b9e42c53c83df4409fb9.tar.gz
chromium_src-03fc700b3d295c057535b9e42c53c83df4409fb9.tar.bz2
Revert 50917 - Added an about:about page (continuation)
continued from http://codereview.chromium.org/2754002/show changelist disappeared after machine swap. Added a new page, about:about (or chrome://about/about) Includes a list of most of the about:* pages (eg. Left out about:inducebrowsercrashforrealz) Page is constructed within browser_about_handler.cc BUG=44699 TEST=Go to about:about, and see if About page loads. Check if links work. Review URL: http://codereview.chromium.org/2799038 TBR=hinoka@chromium.org Review URL: http://codereview.chromium.org/2813037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50922 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/browser_about_handler.cc63
-rw-r--r--chrome/common/url_constants.cc5
-rw-r--r--chrome/common/url_constants.h4
-rw-r--r--chrome/test/functional/special_tabs.py1
4 files changed, 0 insertions, 73 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index dff8499..afe5117 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -86,7 +86,6 @@ namespace {
// The (alphabetized) paths used for the about pages.
const char kCreditsPath[] = "credits";
-const char kCachePath[] = "cache";
const char kDnsPath[] = "dns";
const char kHistogramsPath[] = "histograms";
const char kMemoryRedirectPath[] = "memory-redirect";
@@ -97,10 +96,6 @@ const char kTasksPath[] = "tasks";
const char kTcmallocPath[] = "tcmalloc";
const char kTermsPath[] = "terms";
const char kVersionPath[] = "version";
-const char kAboutPath[] = "about";
-// Not about:* pages, but included to make about:about look nicer
-const char kNetInternalsPath[] = "net-internals";
-const char kPluginsPath[] = "plugins";
#if defined(OS_LINUX)
const char kLinuxProxyConfigPath[] = "linux-proxy-config";
@@ -112,31 +107,6 @@ const char kOSCreditsPath[] = "os-credits";
const char kSysPath[] = "system";
#endif
-// Add path here to be included in about:about
-const char *kAllAboutPaths[] = {
- kCachePath,
- kCreditsPath,
- kDnsPath,
- kHistogramsPath,
- kMemoryPath,
- kNetInternalsPath,
- kPluginsPath,
- kStatsPath,
- kSyncPath,
- kTasksPath,
- kTcmallocPath,
- kTermsPath,
- kVersionPath,
-#if defined(OS_LINUX)
- kLinuxProxyConfigPath,
-#endif
-#if defined(OS_CHROMEOS)
- kNetworkPath,
- kOSCreditPath,
- kSysPath,
-#endif
- };
-
// Points to the singleton AboutSource object, if any.
ChromeURLDataManager::DataSource* about_source = NULL;
@@ -235,37 +205,6 @@ class ChromeOSAboutVersionHandler {
// Individual about handlers ---------------------------------------------------
-std::string AboutAbout() {
- std::string html;
- 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] == kNetInternalsPath ||
- kAllAboutPaths[i] == kPluginsPath)
- html.append("<li><a href='chrome://");
- else
- html.append("<li><a href='chrome://about/");
- html.append(kAllAboutPaths[i]);
- html.append("/'>about:");
- html.append(kAllAboutPaths[i]);
- html.append("</a>\n");
- }
- const char *debug[] = { "crash", "hang", "shorthang" };
- html.append("</ul><h2>For Debug</h2>");
- html.append("</ul><p>The following pages are for debugging purposes only. "
- "Because they crash or hang the renderer, they're not linked "
- "directly; you can type them into the address bar if you need "
- "them.</p><ul>");
- for (size_t i = 0; i < arraysize(debug); i++) {
- html.append("<li>");
- html.append("about:");
- html.append(debug[i]);
- html.append("\n");
- }
- html.append("</ul></body></html>");
- return html;
-}
-
#if defined(OS_CHROMEOS)
std::string AboutNetwork(const std::string& query) {
int refresh;
@@ -801,8 +740,6 @@ void AboutSource::StartDataRequest(const std::string& path_raw,
} else if (path == kCreditsPath) {
response = ResourceBundle::GetSharedInstance().GetRawDataResource(
IDR_CREDITS_HTML).as_string();
- } else if (path == kAboutPath) {
- response = AboutAbout();
#if defined(OS_CHROMEOS)
} else if (path == kOSCreditsPath) {
response = ResourceBundle::GetSharedInstance().GetRawDataResource(
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index ae0c3fc..5bb6ba8 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -51,11 +51,6 @@ const char kAboutNetInternalsURL[] = "about:net-internals";
const char kAboutPluginsURL[] = "about:plugins";
const char kAboutShorthangURL[] = "about:shorthang";
const char kAboutTermsURL[] = "about:terms";
-const char kAboutAboutURL[] = "about:about";
-const char kAboutDNSURL[] = "about:dns";
-const char kAboutHistogramsURL[] = "about:histograms";
-const char kAboutVersionURL[] = "about:version";
-
// Use an obfuscated URL to make this nondiscoverable, we only want this
// to be used for testing.
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 1972fce..b83c928 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -46,10 +46,6 @@ extern const char kAboutMemoryURL[];
extern const char kAboutPluginsURL[];
extern const char kAboutShorthangURL[];
extern const char kAboutTermsURL[];
-extern const char kAboutAboutURL[];
-extern const char kAboutDNSURL[];
-extern const char kAboutHistogramsURL[];
-extern const char kAboutVersionURL[];
// chrome: URLs (including schemes). Should be kept in sync with the
// components below.
diff --git a/chrome/test/functional/special_tabs.py b/chrome/test/functional/special_tabs.py
index 954f937..0edc858 100644
--- a/chrome/test/functional/special_tabs.py
+++ b/chrome/test/functional/special_tabs.py
@@ -18,7 +18,6 @@ class SpecialTabsTest(pyauto.PyUITest):
special_url_tabs = {
'about:': 'About Version',
- 'about:about': 'About Pages',
'about:appcache-internals': 'AppCache Internals',
'about:credits': 'Credits',
'about:dns': 'About DNS',
generated by cgit v1.1 at 2025-02-09 19:24:58 +0000