DOMUI: Make Settings page available at chrome://settings.

BUG=56152
TEST=out/Debug/chrome --enable-tabbed-options. Navigate to the Settings page,
it should works as before.

Review URL: http://codereview.chromium.org/3461010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60135 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 12 insertions, 12 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index f2e364c..8334742 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1826,7 +1826,7 @@ void Browser::ShowBrokenPageTab(TabContents* contents) {
 }
 
 void Browser::ShowOptionsTab(const std::string& sub_page) {
-  GURL url(chrome::kChromeUIOptionsURL + sub_page);
+  GURL url(chrome::kChromeUISettingsURL + sub_page);
 
   // See if there is already an options tab open that we can use.
   for (int i = 0; i < tabstrip_model_->count(); i++) {
diff --git a/chrome/browser/custom_home_pages_table_model.cc b/chrome/browser/custom_home_pages_table_model.cc
index 13b1083..59b9ca4 100644
--- a/chrome/browser/custom_home_pages_table_model.cc
+++ b/chrome/browser/custom_home_pages_table_model.cc
@@ -113,7 +113,7 @@ void CustomHomePagesTableModel::SetToCurrentlyOpenPages() {
       const GURL url = browser->GetTabContentsAt(tab_index)->GetURL();
       if (!url.is_empty() &&
           !(url.SchemeIs(chrome::kChromeUIScheme) &&
-            url.host() == chrome::kChromeUIOptionsHost))
+            url.host() == chrome::kChromeUISettingsHost))
         Add(add_index++, url);
     }
   }
diff --git a/chrome/browser/dom_ui/dom_ui_factory.cc b/chrome/browser/dom_ui/dom_ui_factory.cc
index d649e45..3b80c43 100644
--- a/chrome/browser/dom_ui/dom_ui_factory.cc
+++ b/chrome/browser/dom_ui/dom_ui_factory.cc
@@ -153,12 +153,12 @@ static DOMUIFactoryFunction GetDOMUIFactoryFunction(Profile* profile,
     return &NewDOMUI<RegisterPageUI>;
   if (url.host() == chrome::kChromeUISlideshowHost)
     return &NewDOMUI<SlideshowUI>;
-  if (url.host() == chrome::kChromeUIOptionsHost)
+  if (url.host() == chrome::kChromeUISettingsHost)
     return &NewDOMUI<OptionsUI>;
   if (url.host() == chrome::kChromeUISystemInfoHost)
     return &NewDOMUI<SystemInfoUI>;
 #else
-  if (url.host() == chrome::kChromeUIOptionsHost) {
+  if (url.host() == chrome::kChromeUISettingsHost) {
     if (CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnableTabbedOptions)) {
       return &NewDOMUI<OptionsUI>;
@@ -248,7 +248,7 @@ RefCountedMemory* DOMUIFactory::GetFaviconResourceBytes(Profile* profile,
   if (about_labs::IsEnabled() && page_url.host() == chrome::kChromeUILabsHost)
     return LabsUI::GetFaviconResourceBytes();
 
-  if (page_url.host() == chrome::kChromeUIOptionsHost)
+  if (page_url.host() == chrome::kChromeUISettingsHost)
     return OptionsUI::GetFaviconResourceBytes();
 
   if (page_url.host() == chrome::kChromeUIPluginsHost)
diff --git a/chrome/browser/dom_ui/options_ui.cc b/chrome/browser/dom_ui/options_ui.cc
index edc493f..a050a24 100644
--- a/chrome/browser/dom_ui/options_ui.cc
+++ b/chrome/browser/dom_ui/options_ui.cc
@@ -72,7 +72,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 OptionsUIHTMLSource::OptionsUIHTMLSource(DictionaryValue* localized_strings)
-    : DataSource(chrome::kChromeUIOptionsHost, MessageLoop::current()) {
+    : DataSource(chrome::kChromeUISettingsHost, MessageLoop::current()) {
   DCHECK(localized_strings);
   localized_strings_.reset(localized_strings);
 }
diff --git a/chrome/browser/dom_ui/options_ui_uitest.cc b/chrome/browser/dom_ui/options_ui_uitest.cc
index d1e8565..ae1aa9b 100644
--- a/chrome/browser/dom_ui/options_ui_uitest.cc
+++ b/chrome/browser/dom_ui/options_ui_uitest.cc
@@ -43,7 +43,7 @@ TEST_F(OptionsUITest, LoadOptionsByURL) {
   ASSERT_TRUE(tab.get());
 
   // Go to the options tab via URL.
-  NavigateToURL(GURL(chrome::kChromeUIOptionsURL));
+  NavigateToURL(GURL(chrome::kChromeUISettingsURL));
   AssertIsOptionsPage(tab);
 }
 
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[];