summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhinoka@chromium.org <hinoka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-27 22:33:10 +0000
committerhinoka@chromium.org <hinoka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-27 22:33:10 +0000
commit7acb2fab4276e34fe442971243064758bcecb162 (patch)
tree3ae0d5993ce400117f79885ebdda8b539f82637e
parent5455842888161a22e42dfcc6c7dba1df34600c5a (diff)
downloadchromium_src-7acb2fab4276e34fe442971243064758bcecb162.zip
chromium_src-7acb2fab4276e34fe442971243064758bcecb162.tar.gz
chromium_src-7acb2fab4276e34fe442971243064758bcecb162.tar.bz2
Revert 50956 - Added an about:about page (recommit)
Added a new page, about:about (or chrome://about/about) continued from http://codereview.chromium.org/2799038/show fixed typo that screwed up ChromeOS compiling BUG=44699 TEST=Go to about:about, and see if About page loads. Check if links work. TBR=pkasting@chromium.org Review URL: http://codereview.chromium.org/2861028 TBR=hinoka@chromium.org Review URL: http://codereview.chromium.org/2814035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat
-rw-r--r--chrome/browser/browser_about_handler.cc64
-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, 74 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index c40d689..a7f0bcf 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -30,7 +30,6 @@
#include "chrome/browser/google_service_auth_error.h"
#include "chrome/browser/memory_details.h"
#include "chrome/browser/metrics/histogram_synchronizer.h"
-#include "chrome/browser/net/dns_global.h"
#include "chrome/browser/net/predictor_api.h"
#include "chrome/browser/platform_util.h"
#include "chrome/browser/pref_service.h"
@@ -87,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";
@@ -98,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";
@@ -113,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,
- kOSCreditsPath,
- kSysPath,
-#endif
- };
-
// Points to the singleton AboutSource object, if any.
ChromeURLDataManager::DataSource* about_source = NULL;
@@ -236,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;
@@ -802,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-01 13:47:11 +0000