web-ui settings: Clean up page urls.

BUG=none
Review URL: http://codereview.chromium.org/6594106

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

20 files changed, 39 insertions, 41 deletions

diff --git a/chrome/browser/resources/options/add_startup_page_overlay.js b/chrome/browser/resources/options/add_startup_page_overlay.js
index 4678629..f0cdda3 100644
--- a/chrome/browser/resources/options/add_startup_page_overlay.js
+++ b/chrome/browser/resources/options/add_startup_page_overlay.js
@@ -13,7 +13,7 @@ cr.define('options', function() {
    * @class
    */
   function AddStartupPageOverlay() {
-    OptionsPage.call(this, 'addStartupPageOverlay',
+    OptionsPage.call(this, 'addStartupPage',
                      templateData.addStartupPageTabTitle,
                      'addStartupPageOverlay');
   }
diff --git a/chrome/browser/resources/options/advanced_options.js b/chrome/browser/resources/options/advanced_options.js
index 19b7275..9082138 100644
--- a/chrome/browser/resources/options/advanced_options.js
+++ b/chrome/browser/resources/options/advanced_options.js
@@ -36,7 +36,7 @@ var OptionsPage = options.OptionsPage;
             ['Options_ContentSettings']);
       };
       $('privacyClearDataButton').onclick = function(event) {
-        OptionsPage.navigateToPage('clearBrowserDataOverlay');
+        OptionsPage.navigateToPage('clearBrowserData');
         chrome.send('coreOptionsUserMetricsAction', ['Options_ClearData']);
       };
 
@@ -56,7 +56,7 @@ var OptionsPage = options.OptionsPage;
       }
 
       $('fontSettingsCustomizeFontsButton').onclick = function(event) {
-        OptionsPage.navigateToPage('fontSettings');
+        OptionsPage.navigateToPage('fonts');
         chrome.send('coreOptionsUserMetricsAction', ['Options_FontSettings']);
       };
       $('defaultFontSize').onchange = function(event) {
@@ -64,7 +64,7 @@ var OptionsPage = options.OptionsPage;
             [String(event.target.options[event.target.selectedIndex].value)]);
       };
       $('language-button').onclick = function(event) {
-        OptionsPage.navigateToPage('language');
+        OptionsPage.navigateToPage('languages');
         chrome.send('coreOptionsUserMetricsAction',
             ['Options_LanuageAndSpellCheckSettings']);
       };
@@ -75,7 +75,7 @@ var OptionsPage = options.OptionsPage;
         };
       } else {
         $('certificatesManageButton').onclick = function(event) {
-          OptionsPage.navigateToPage('certificateManager');
+          OptionsPage.navigateToPage('certificates');
           OptionsPage.showTab($('personal-certs-nav-tab'));
           chrome.send('coreOptionsUserMetricsAction',
                       ['Options_ManageSSLCertificates']);
diff --git a/chrome/browser/resources/options/autofill_edit_address_overlay.js b/chrome/browser/resources/options/autofill_edit_address_overlay.js
index 6f9e872..a0cb1de 100644
--- a/chrome/browser/resources/options/autofill_edit_address_overlay.js
+++ b/chrome/browser/resources/options/autofill_edit_address_overlay.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -14,7 +14,7 @@ cr.define('options', function() {
    * @class
    */
   function AutoFillEditAddressOverlay() {
-    OptionsPage.call(this, 'autoFillEditAddressOverlay',
+    OptionsPage.call(this, 'autoFillEditAddress',
                      templateData.autoFillEditAddressTitle,
                      'autofill-edit-address-overlay');
   }
diff --git a/chrome/browser/resources/options/autofill_edit_creditcard_overlay.js b/chrome/browser/resources/options/autofill_edit_creditcard_overlay.js
index 4becab2..5e7d6dc 100644
--- a/chrome/browser/resources/options/autofill_edit_creditcard_overlay.js
+++ b/chrome/browser/resources/options/autofill_edit_creditcard_overlay.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -22,7 +22,7 @@ cr.define('options', function() {
    * @class
    */
   function AutoFillEditCreditCardOverlay() {
-    OptionsPage.call(this, 'autoFillEditCreditCardOverlay',
+    OptionsPage.call(this, 'autoFillEditCreditCard',
                      templateData.autoFillEditCreditCardTitle,
                      'autofill-edit-credit-card-overlay');
   }
diff --git a/chrome/browser/resources/options/autofill_options.js b/chrome/browser/resources/options/autofill_options.js
index 9f4ac3b..87b1724 100644
--- a/chrome/browser/resources/options/autofill_options.js
+++ b/chrome/browser/resources/options/autofill_options.js
@@ -15,7 +15,7 @@ cr.define('options', function() {
    */
   function AutoFillOptions() {
     OptionsPage.call(this,
-                     'autoFillOptions',
+                     'autofill',
                      templateData.autoFillOptionsPageTabTitle,
                      'autofill-options');
   }
@@ -88,7 +88,7 @@ cr.define('options', function() {
       var title = localStrings.getString('addAddressTitle');
       AutoFillEditAddressOverlay.setTitle(title);
       AutoFillEditAddressOverlay.clearInputFields();
-      OptionsPage.navigateToPage('autoFillEditAddressOverlay');
+      OptionsPage.navigateToPage('autoFillEditAddress');
     },
 
     /**
@@ -101,7 +101,7 @@ cr.define('options', function() {
       var title = localStrings.getString('addCreditCardTitle');
       AutoFillEditCreditCardOverlay.setTitle(title);
       AutoFillEditCreditCardOverlay.clearInputFields();
-      OptionsPage.navigateToPage('autoFillEditCreditCardOverlay');
+      OptionsPage.navigateToPage('autoFillEditCreditCard');
     },
 
     /**
@@ -172,7 +172,7 @@ cr.define('options', function() {
       var title = localStrings.getString('editAddressTitle');
       AutoFillEditAddressOverlay.setTitle(title);
       AutoFillEditAddressOverlay.loadAddress(address);
-      OptionsPage.navigateToPage('autoFillEditAddressOverlay');
+      OptionsPage.navigateToPage('autoFillEditAddress');
     },
 
     /**
@@ -185,7 +185,7 @@ cr.define('options', function() {
       var title = localStrings.getString('editCreditCardTitle');
       AutoFillEditCreditCardOverlay.setTitle(title);
       AutoFillEditCreditCardOverlay.loadCreditCard(creditCard);
-      OptionsPage.navigateToPage('autoFillEditCreditCardOverlay');
+      OptionsPage.navigateToPage('autoFillEditCreditCard');
     },
   };
 
diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js
index a3502b6..6f5a2a7 100644
--- a/chrome/browser/resources/options/browser_options.js
+++ b/chrome/browser/resources/options/browser_options.js
@@ -46,7 +46,7 @@ cr.define('options', function() {
         chrome.send('setStartupPagesToCurrentPages');
       };
       $('startupAddButton').onclick = function(event) {
-        OptionsPage.navigateToPage('addStartupPageOverlay');
+        OptionsPage.navigateToPage('addStartupPage');
       };
       $('defaultSearchManageEnginesButton').onclick = function(event) {
         OptionsPage.navigateToPage('searchEngines');
@@ -60,7 +60,7 @@ cr.define('options', function() {
           // Leave disabled for now. The PrefCheckbox handler already set it to
           // true so undo that.
           Preferences.setBooleanPref(this.pref, false, this.metric);
-          OptionsPage.navigateToPage('instantConfirmOverlay');
+          OptionsPage.navigateToPage('instantConfirm');
         }
       };
       $('defaultSearchEngine').onchange = this.setDefaultSearchEngine;
diff --git a/chrome/browser/resources/options/certificate_manager.js b/chrome/browser/resources/options/certificate_manager.js
index cf8a43d..687099f 100644
--- a/chrome/browser/resources/options/certificate_manager.js
+++ b/chrome/browser/resources/options/certificate_manager.js
@@ -142,7 +142,7 @@ cr.define('options', function() {
    * @constructor
    */
   function CertificateManager(model) {
-    OptionsPage.call(this, 'certificateManager',
+    OptionsPage.call(this, 'certificates',
                      templateData.certificateManagerPageTabTitle,
                      'certificateManagerPage');
   }
diff --git a/chrome/browser/resources/options/certificate_restore_overlay.js b/chrome/browser/resources/options/certificate_restore_overlay.js
index db75a9f..d76a329 100644
--- a/chrome/browser/resources/options/certificate_restore_overlay.js
+++ b/chrome/browser/resources/options/certificate_restore_overlay.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -11,7 +11,7 @@ cr.define('options', function() {
    * @class
    */
   function CertificateRestoreOverlay() {
-    OptionsPage.call(this, 'certificateRestoreOverlay',
+    OptionsPage.call(this, 'certificateRestore',
                      '',
                      'certificateRestoreOverlay');
   }
@@ -82,7 +82,7 @@ cr.define('options', function() {
 
   CertificateRestoreOverlay.show = function() {
     CertificateRestoreOverlay.getInstance().clearInputFields_();
-    OptionsPage.navigateToPage('certificateRestoreOverlay');
+    OptionsPage.navigateToPage('certificateRestore');
   };
 
   CertificateRestoreOverlay.dismiss = function() {
diff --git a/chrome/browser/resources/options/clear_browser_data_overlay.js b/chrome/browser/resources/options/clear_browser_data_overlay.js
index c402347..bc7eafc 100644
--- a/chrome/browser/resources/options/clear_browser_data_overlay.js
+++ b/chrome/browser/resources/options/clear_browser_data_overlay.js
@@ -11,7 +11,7 @@ cr.define('options', function() {
    * @class
    */
   function ClearBrowserDataOverlay() {
-    OptionsPage.call(this, 'clearBrowserDataOverlay',
+    OptionsPage.call(this, 'clearBrowserData',
                      templateData.clearBrowserDataOverlayTabTitle,
                      'clearBrowserDataOverlay');
   }
diff --git a/chrome/browser/resources/options/content_settings.js b/chrome/browser/resources/options/content_settings.js
index 59b0119..444aed6 100644
--- a/chrome/browser/resources/options/content_settings.js
+++ b/chrome/browser/resources/options/content_settings.js
@@ -53,7 +53,7 @@ cr.define('options', function() {
 
       $('show-cookies-button').onclick = function(event) {
         chrome.send('coreOptionsUserMetricsAction', ['Options_ShowCookies']);
-        OptionsPage.navigateToPage('cookiesView');
+        OptionsPage.navigateToPage('cookies');
       };
 
       if (!templateData.enable_click_to_play)
diff --git a/chrome/browser/resources/options/cookies_view.js b/chrome/browser/resources/options/cookies_view.js
index f640404..8fdd60a 100644
--- a/chrome/browser/resources/options/cookies_view.js
+++ b/chrome/browser/resources/options/cookies_view.js
@@ -14,7 +14,7 @@ cr.define('options', function() {
    * @constructor
    */
   function CookiesView(model) {
-    OptionsPage.call(this, 'cookiesView',
+    OptionsPage.call(this, 'cookies',
                      templateData.cookiesViewPageTabTitle,
                      'cookiesViewPage');
   }
diff --git a/chrome/browser/resources/options/font_settings.js b/chrome/browser/resources/options/font_settings.js
index 2c5cc84..e1c5144 100644
--- a/chrome/browser/resources/options/font_settings.js
+++ b/chrome/browser/resources/options/font_settings.js
@@ -13,7 +13,7 @@ cr.define('options', function() {
    */
   function FontSettings() {
     OptionsPage.call(this,
-                     'fontSettings',
+                     'fonts',
                      templateData.fontSettingsPageTabTitle,
                      'font-settings');
   }
diff --git a/chrome/browser/resources/options/import_data_overlay.js b/chrome/browser/resources/options/import_data_overlay.js
index 9496f8a7..94273ee 100644
--- a/chrome/browser/resources/options/import_data_overlay.js
+++ b/chrome/browser/resources/options/import_data_overlay.js
@@ -12,7 +12,7 @@ cr.define('options', function() {
    */
   function ImportDataOverlay() {
     OptionsPage.call(this,
-                     'importDataOverlay',
+                     'importData',
                      templateData.importDataOverlayTabTitle,
                      'import-data-overlay');
   }
diff --git a/chrome/browser/resources/options/instant_confirm_overlay.js b/chrome/browser/resources/options/instant_confirm_overlay.js
index 327ab539..3ba9793 100644
--- a/chrome/browser/resources/options/instant_confirm_overlay.js
+++ b/chrome/browser/resources/options/instant_confirm_overlay.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,7 +6,7 @@ cr.define('options', function() {
   var OptionsPage = options.OptionsPage;
 
   function InstantConfirmOverlay() {
-    OptionsPage.call(this, 'instantConfirmOverlay',
+    OptionsPage.call(this, 'instantConfirm',
                      templateData.instantConfirmTitle,
                      'instantConfirmOverlay');
   };
diff --git a/chrome/browser/resources/options/language_add_language_overlay.js b/chrome/browser/resources/options/language_add_language_overlay.js
index 56d193a..f1696a1 100644
--- a/chrome/browser/resources/options/language_add_language_overlay.js
+++ b/chrome/browser/resources/options/language_add_language_overlay.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -13,7 +13,7 @@ cr.define('options', function() {
    * @constructor
    */
   function AddLanguageOverlay() {
-    OptionsPage.call(this, 'addLanguageOverlay',
+    OptionsPage.call(this, 'addLanguage',
                      localStrings.getString('add_button'),
                      'add-language-overlay-page');
   }
diff --git a/chrome/browser/resources/options/language_options.js b/chrome/browser/resources/options/language_options.js
index eae331a..07dfb7f 100644
--- a/chrome/browser/resources/options/language_options.js
+++ b/chrome/browser/resources/options/language_options.js
@@ -28,7 +28,7 @@ cr.define('options', function() {
    * @constructor
    */
   function LanguageOptions(model) {
-    OptionsPage.call(this, 'language', templateData.languagePageTabTitle,
+    OptionsPage.call(this, 'languages', templateData.languagePageTabTitle,
                      'languagePage');
   }
 
@@ -72,7 +72,7 @@ cr.define('options', function() {
           var addLanguageCode = match[1];
           $('language-options-list').addLanguage(addLanguageCode);
         } else {
-          OptionsPage.navigateToPage('addLanguageOverlay');
+          OptionsPage.navigateToPage('addLanguage');
         }
       };
       // Set up remove button.
diff --git a/chrome/browser/resources/options/password_manager.js b/chrome/browser/resources/options/password_manager.js
index 82eb3ce..6e9f7de 100644
--- a/chrome/browser/resources/options/password_manager.js
+++ b/chrome/browser/resources/options/password_manager.js
@@ -16,7 +16,7 @@ cr.define('options', function() {
   function PasswordManager() {
     this.activeNavTab = null;
     OptionsPage.call(this,
-                     'passwordManager',
+                     'passwords',
                      templateData.passwordsPageTabTitle,
                      'password-manager');
   }
diff --git a/chrome/browser/resources/options/personal_options.js b/chrome/browser/resources/options/personal_options.js
index 2edbb5c..c134f47 100644
--- a/chrome/browser/resources/options/personal_options.js
+++ b/chrome/browser/resources/options/personal_options.js
@@ -48,13 +48,13 @@ cr.define('options', function() {
         chrome.send('openPrivacyDashboardTabAndActivate');
       };
       $('manage-passwords').onclick = function(event) {
-        OptionsPage.navigateToPage('passwordManager');
+        OptionsPage.navigateToPage('passwords');
         OptionsPage.showTab($('passwords-nav-tab'));
         chrome.send('coreOptionsUserMetricsAction',
             ['Options_ShowPasswordManager']);
       };
       $('autofill-settings').onclick = function(event) {
-        OptionsPage.navigateToPage('autoFillOptions');
+        OptionsPage.navigateToPage('autofill');
         chrome.send('coreOptionsUserMetricsAction',
             ['Options_ShowAutoFillSettings']);
       };
@@ -64,7 +64,7 @@ cr.define('options', function() {
 
       if (!cr.isChromeOS) {
         $('import-data').onclick = function(event) {
-          OptionsPage.navigateToPage('importDataOverlay');
+          OptionsPage.navigateToPage('importData');
           chrome.send('coreOptionsUserMetricsAction', ['Import_ShowDlg']);
         };
 
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index a2aaeef..f876d03 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -181,19 +181,18 @@ const char kGpuInternalsURL[] = "chrome://gpu-internals/";
 
 // Option sub pages.
 const char kAdvancedOptionsSubPage[] =  "advanced";
-const char kAutoFillSubPage[] = "autoFillOptions";
+const char kAutoFillSubPage[] = "autofill";
 const char kBrowserOptionsSubPage[] =  "browser";
-const char kClearBrowserDataSubPage[] = "clearBrowserDataOverlay";
+const char kClearBrowserDataSubPage[] = "clearBrowserData";
 const char kContentSettingsSubPage[] = "content";
 const char kContentSettingsExceptionsSubPage[] = "contentExceptions";
 const char kDefaultOptionsSubPage[] =  "";
-const char kImportDataSubPage[] = "importDataOverlay";
+const char kImportDataSubPage[] = "importData";
 const char kPersonalOptionsSubPage[] =  "personal";
-const char kSearchEnginesOptionsSubPage[] = "editSearchEngineOverlay";
 const char kSearchEnginesSubPage[] = "searchEngines";
 #if defined(OS_CHROMEOS)
 const char kInternetOptionsSubPage[] = "internet";
-const char kLanguageOptionsSubPage[] = "language";
+const char kLanguageOptionsSubPage[] = "languages";
 const char kSystemOptionsSubPage[] = "system";
 #endif
 
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 41dd782..cfd8080 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -186,7 +186,6 @@ extern const char kContentSettingsSubPage[];
 extern const char kContentSettingsExceptionsSubPage[];
 extern const char kImportDataSubPage[];
 extern const char kPersonalOptionsSubPage[];
-extern const char kSearchEnginesOptionsSubPage[];
 extern const char kSearchEnginesSubPage[];
 #if defined(OS_CHROMEOS)
 extern const char kInternetOptionsSubPage[];