summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-17 23:18:55 +0000
committerzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-17 23:18:55 +0000
commit9c0a58008e54678318d98d0a519bd47e9bd84f07 (patch)
tree129b3e7cc2e1acd4914e4856eb7b2e9a8f819e8b /chrome/common
parent4f871d502565af559f434fca4decc00363af5bc3 (diff)
downloadchromium_src-9c0a58008e54678318d98d0a519bd47e9bd84f07.zip
chromium_src-9c0a58008e54678318d98d0a519bd47e9bd84f07.tar.gz
chromium_src-9c0a58008e54678318d98d0a519bd47e9bd84f07.tar.bz2
Bunch of bugreport fixes. Also, moved about:system page to chrome:system.
BUG=chromium-os:6737,chromium-os:6739,chromium-os:6547,chromium-os:6108 TEST=test the bugs above Review URL: http://codereview.chromium.org/3417008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/url_constants.cc3
-rw-r--r--chrome/common/url_constants.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 46c4cb0..273057f 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -57,7 +57,6 @@ const char kAboutMemoryURL[] = "about:memory";
const char kAboutNetInternalsURL[] = "about:net-internals";
const char kAboutPluginsURL[] = "about:plugins";
const char kAboutShorthangURL[] = "about:shorthang";
-const char kAboutSystemURL[] = "about:system";
const char kAboutTermsURL[] = "about:terms";
const char kAboutVaporwareURL[] = "about:vaporware";
const char kAboutVersionURL[] = "about:version";
@@ -88,6 +87,7 @@ const char kChromeUIPluginsURL[] = "chrome://plugins/";
const char kChromeUIPrintURL[] = "chrome://print/";
const char kChromeUIRegisterPageURL[] = "chrome://register/";
const char kChromeUISlideshowURL[] = "chrome://slideshow/";
+const char kChromeUISystemInfoURL[] = "chrome://system/";
const char kChromeUIBookmarksHost[] = "bookmarks";
const char kChromeUIBugReportHost[] = "bugreport";
@@ -114,6 +114,7 @@ const char kChromeUIRemotingHost[] = "remoting";
const char kChromeUIResourcesHost[] = "resources";
const char kChromeUISlideshowHost[] = "slideshow";
const char kChromeUISyncResourcesHost[] = "syncresources";
+const char kChromeUISystemInfoHost[] = "system";
const char kChromeUIRemotingResourcesHost[] = "remotingresources";
const char kChromeUIThemePath[] = "theme";
const char kChromeUIScreenshotPath[] = "screenshots";
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 986d23c..cf276b4 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -52,7 +52,6 @@ extern const char kAboutMemoryURL[];
extern const char kAboutNetInternalsURL[];
extern const char kAboutPluginsURL[];
extern const char kAboutShorthangURL[];
-extern const char kAboutSystemURL[];
extern const char kAboutTermsURL[];
extern const char kAboutVaporwareURL[];
extern const char kAboutVersionURL[];
@@ -81,6 +80,7 @@ extern const char kChromeUIPluginsURL[];
extern const char kChromeUIPrintURL[];
extern const char kChromeUIRegisterPageURL[];
extern const char kChromeUISlideshowURL[];
+extern const char kChromeUISystemInfoURL[];
// chrome components of URLs. Should be kept in sync with the full URLs
// above.
@@ -111,6 +111,7 @@ extern const char kChromeUIResourcesHost[];
extern const char kChromeUIScreenshotPath[];
extern const char kChromeUISlideshowHost[];
extern const char kChromeUISyncResourcesHost[];
+extern const char kChromeUISystemInfoHost[];
extern const char kChromeUIThemePath[];
extern const char kChromeUIThumbnailPath[];