summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/browser.cc4
-rw-r--r--chrome/common/url_constants.cc15
-rw-r--r--chrome/common/url_constants.h15
3 files changed, 17 insertions, 17 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 367a9db..7ed63c7 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1844,9 +1844,7 @@ void Browser::OpenKeywordEditor() {
UserMetrics::RecordAction(UserMetricsAction("EditSearchEngines"), profile_);
if (CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableTabbedOptions)) {
- ShowOptionsTab(
- chrome::kBrowserOptionsSubPage + kHashMark +
- chrome::kSearchEnginesOptionsSubPage);
+ ShowOptionsTab(chrome::kSearchEnginesSubPage);
} else {
window_->ShowSearchEnginesDialog();
}
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 9847390..1c65a66 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -146,19 +146,20 @@ const char kNetworkViewInternalsURL[] = "chrome://net-internals/";
const char kNetworkViewCacheURL[] = "chrome://view-http-cache/";
// Option sub pages.
-const char kDefaultOptionsSubPage[] = "";
-const char kBrowserOptionsSubPage[] = "browser";
-const char kPersonalOptionsSubPage[] = "personal";
const char kAdvancedOptionsSubPage[] = "advanced";
const char kAutoFillSubPage[] = "autoFillOptions";
-const char kSearchEnginesOptionsSubPage[] = "editSearchEngineOverlay";
+const char kBrowserOptionsSubPage[] = "browser";
const char kClearBrowserDataSubPage[] = "clearBrowserDataOverlay";
-const char kImportDataSubPage[] = "importDataOverlay";
const char kContentSettingsSubPage[] = "content";
+const char kDefaultOptionsSubPage[] = "";
+const char kImportDataSubPage[] = "importDataOverlay";
+const char kPersonalOptionsSubPage[] = "personal";
+const char kSearchEnginesOptionsSubPage[] = "editSearchEngineOverlay";
+const char kSearchEnginesSubPage[] = "searchEngines";
#if defined(OS_CHROMEOS)
-const char kSystemOptionsSubPage[] = "system";
-const char kLanguageOptionsSubPage[] = "language";
const char kInternetOptionsSubPage[] = "internet";
+const char kLanguageOptionsSubPage[] = "language";
+const char kSystemOptionsSubPage[] = "system";
#endif
void RegisterChromeSchemes() {
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 7ac0297..e11e5b5 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -144,19 +144,20 @@ extern const char kNetworkViewCacheURL[];
extern const char kNetworkViewInternalsURL[];
// Options sub-pages.
-extern const char kDefaultOptionsSubPage[];
-extern const char kBrowserOptionsSubPage[];
-extern const char kPersonalOptionsSubPage[];
extern const char kAdvancedOptionsSubPage[];
extern const char kAutoFillSubPage[];
-extern const char kSearchEnginesOptionsSubPage[];
+extern const char kBrowserOptionsSubPage[];
extern const char kClearBrowserDataSubPage[];
-extern const char kImportDataSubPage[];
extern const char kContentSettingsSubPage[];
+extern const char kDefaultOptionsSubPage[];
+extern const char kImportDataSubPage[];
+extern const char kPersonalOptionsSubPage[];
+extern const char kSearchEnginesOptionsSubPage[];
+extern const char kSearchEnginesSubPage[];
#if defined(OS_CHROMEOS)
-extern const char kSystemOptionsSubPage[];
-extern const char kLanguageOptionsSubPage[];
extern const char kInternetOptionsSubPage[];
+extern const char kLanguageOptionsSubPage[];
+extern const char kSystemOptionsSubPage[];
#endif
// Call near the beginning of startup to register Chrome's internal URLs that