summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/url_constants.cc6
-rw-r--r--chrome/common/url_constants.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 273057f..5ae5181 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -65,7 +65,7 @@ const char kAboutVersionURL[] = "about:version";
// to be used for testing.
const char kAboutBrowserCrash[] = "about:inducebrowsercrashforrealz";
-const char kChromeUIAboutURL[] = "chrome://options/about";
+const char kChromeUIAboutURL[] = "chrome://settings/about";
const char kChromeUIAppLauncherURL[] = "chrome://newtab/#mode=app-launcher";
const char kChromeUIBookmarksURL[] = "chrome://bookmarks/";
const char kChromeUIBugReportURL[] = "chrome://bugreport/";
@@ -82,10 +82,10 @@ const char kChromeUIKeyboardURL[] = "chrome://keyboard/";
const char kChromeUILabsURL[] = "chrome://labs/";
const char kChromeUIMediaplayerURL[] = "chrome://mediaplayer/";
const char kChromeUINewTabURL[] = "chrome://newtab";
-const char kChromeUIOptionsURL[] = "chrome://options/";
const char kChromeUIPluginsURL[] = "chrome://plugins/";
const char kChromeUIPrintURL[] = "chrome://print/";
const char kChromeUIRegisterPageURL[] = "chrome://register/";
+const char kChromeUISettingsURL[] = "chrome://settings/";
const char kChromeUISlideshowURL[] = "chrome://slideshow/";
const char kChromeUISystemInfoURL[] = "chrome://system/";
@@ -106,12 +106,12 @@ const char kChromeUILabsHost[] = "labs";
const char kChromeUIMediaplayerHost[] = "mediaplayer";
const char kChromeUINetInternalsHost[] = "net-internals";
const char kChromeUINewTabHost[] = "newtab";
-const char kChromeUIOptionsHost[] = "options";
const char kChromeUIPluginsHost[] = "plugins";
const char kChromeUIPrintHost[] = "print";
const char kChromeUIRegisterPageHost[] = "register";
const char kChromeUIRemotingHost[] = "remoting";
const char kChromeUIResourcesHost[] = "resources";
+const char kChromeUISettingsHost[] = "settings";
const char kChromeUISlideshowHost[] = "slideshow";
const char kChromeUISyncResourcesHost[] = "syncresources";
const char kChromeUISystemInfoHost[] = "system";
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index cf276b4..cd2f889 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -75,10 +75,10 @@ extern const char kChromeUIKeyboardURL[];
extern const char kChromeUILabsURL[];
extern const char kChromeUIMediaplayerURL[];
extern const char kChromeUINewTabURL[];
-extern const char kChromeUIOptionsURL[];
extern const char kChromeUIPluginsURL[];
extern const char kChromeUIPrintURL[];
extern const char kChromeUIRegisterPageURL[];
+extern const char kChromeUISettingsURL[];
extern const char kChromeUISlideshowURL[];
extern const char kChromeUISystemInfoURL[];
@@ -101,7 +101,6 @@ extern const char kChromeUILabsHost[];
extern const char kChromeUIMediaplayerHost[];
extern const char kChromeUINetInternalsHost[];
extern const char kChromeUINewTabHost[];
-extern const char kChromeUIOptionsHost[];
extern const char kChromeUIPluginsHost[];
extern const char kChromeUIPrintHost[];
extern const char kChromeUIRegisterPageHost[];
@@ -109,6 +108,7 @@ extern const char kChromeUIRemotingHost[];
extern const char kChromeUIRemotingResourcesHost[];
extern const char kChromeUIResourcesHost[];
extern const char kChromeUIScreenshotPath[];
+extern const char kChromeUISettingsHost[];
extern const char kChromeUISlideshowHost[];
extern const char kChromeUISyncResourcesHost[];
extern const char kChromeUISystemInfoHost[];