get rid of old options pages

chrome/browser/ui/browser.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 116 matching lines @@
 #include "chrome/browser/ui/status_bubble.h"
 #include "chrome/browser/ui/sync/browser_synced_window_delegate.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/tabs/dock_info.h"
 #include "chrome/browser/ui/tabs/tab_menu_model.h"
 #include "chrome/browser/ui/web_applications/web_app_ui.h"
 #include "chrome/browser/ui/webui/feedback_ui.h"
 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h"
-#include "chrome/browser/ui/webui/options/content_settings_handler.h"
+#include "chrome/browser/ui/webui/options2/content_settings_handler2.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
 #include "chrome/browser/ui/window_sizer.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/custom_handlers/protocol_handler.h"
@@ skipping 2182 matching lines @@
   // We record the user metric for this event in WrenchMenu::RunMenu.
   window_->ShowAppMenu();
 }
 
 void Browser::ShowAvatarMenu() {
   window_->ShowAvatarBubbleFromAvatarButton();
 }
 
 void Browser::ShowHistoryTab() {
   content::RecordAction(UserMetricsAction("ShowHistory"));
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableUberPage)) {
-    ShowSingletonTabOverwritingNTP(
-        GetSingletonTabNavigateParams(GURL(chrome::kChromeUIHistoryFrameURL)));
-  } else {
-    browser::NavigateParams params(GetSingletonTabNavigateParams(
-        GURL(std::string(chrome::kChromeUIUberURL) +
-             chrome::kChromeUIHistoryHost)));
-    params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
-    ShowSingletonTabOverwritingNTP(params);
-  }
+  browser::NavigateParams params(GetSingletonTabNavigateParams(
+      GURL(std::string(chrome::kChromeUIUberURL) +
+           chrome::kChromeUIHistoryHost)));
+  params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
+  ShowSingletonTabOverwritingNTP(params);
 }
 
 void Browser::ShowDownloadsTab() {
   content::RecordAction(UserMetricsAction("ShowDownloads"));
 #if !defined(OS_CHROMEOS)
   // ChromiumOS uses ActiveDownloadsUI instead of of DownloadShelf.
   if (window()) {
     DownloadShelf* shelf = window()->GetDownloadShelf();
     if (shelf->IsShowing())
       shelf->Close();
   }
 #endif
   ShowSingletonTabOverwritingNTP(
       GetSingletonTabNavigateParams(GURL(chrome::kChromeUIDownloadsURL)));
 }
 
 void Browser::ShowExtensionsTab() {
   content::RecordAction(UserMetricsAction("ShowExtensions"));
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableUberPage)) {
-    ShowOptionsTab(chrome::kExtensionsSubPage);
-  } else {
-    browser::NavigateParams params(GetSingletonTabNavigateParams(
-        GURL(std::string(chrome::kChromeUIUberURL) +
-             chrome::kChromeUIExtensionsHost)));
-    params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
-    ShowSingletonTabOverwritingNTP(params);
-  }
+  browser::NavigateParams params(GetSingletonTabNavigateParams(
+      GURL(std::string(chrome::kChromeUIUberURL) +
+           chrome::kChromeUIExtensionsHost)));
+  params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
+  ShowSingletonTabOverwritingNTP(params);
 }
 
 void Browser::ShowAboutConflictsTab() {
   content::RecordAction(UserMetricsAction("AboutConflicts"));
   ShowSingletonTab(GURL(chrome::kChromeUIConflictsURL));
 }
 
 void Browser::ShowBrokenPageTab(WebContents* contents) {
   content::RecordAction(UserMetricsAction("Feedback"));
   string16 page_title = contents->GetTitle();
   NavigationEntry* entry = contents->GetController().GetActiveEntry();
   if (!entry)
     return;
   std::string page_url = entry->GetURL().spec();
   std::vector<std::string> subst;
   subst.push_back(UTF16ToASCII(page_title));
   subst.push_back(page_url);
   std::string report_page_url =
       ReplaceStringPlaceholders(kBrokenPageUrl, subst, NULL);
   ShowSingletonTab(GURL(report_page_url));
 }
 
 void Browser::ShowOptionsTab(const std::string& sub_page) {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableUberPage)) {
-    browser::NavigateParams params(GetSingletonTabNavigateParams(
-        GURL(chrome::kChromeUISettingsURL + sub_page)));
-    params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
-    ShowSingletonTabOverwritingNTP(params);
+  std::string url;
+  if (sub_page == chrome::kExtensionsSubPage) {
+    url = std::string(chrome::kChromeUIUberURL) +
+        chrome::kChromeUIExtensionsHost;
+#if defined(OS_CHROMEOS)
+  } else if (sub_page.find(chrome::kInternetOptionsSubPage, 0) !=
+             std::string::npos) {
+    std::string::size_type loc = sub_page.find("?", 0);
+    std::string network_page = loc != std::string::npos ?
+        sub_page.substr(loc) : std::string();
+    url = std::string(chrome::kChromeUIUberURL) +
+        chrome::kChromeUISettingsHost + network_page;
+#endif
   } else {
-    std::string url;
-    if (sub_page == chrome::kExtensionsSubPage) {
-      url = std::string(chrome::kChromeUIUberURL) +
-          chrome::kChromeUIExtensionsHost;
-#if defined(OS_CHROMEOS)
-    } else if (sub_page.find(chrome::kInternetOptionsSubPage, 0) !=
-               std::string::npos) {
-      std::string::size_type loc = sub_page.find("?", 0);
-      std::string network_page = loc != std::string::npos ?
-          sub_page.substr(loc) : std::string();
-      url = std::string(chrome::kChromeUIUberURL) +
-          chrome::kChromeUISettingsHost + network_page;
-#endif
-    } else {
-      url = std::string(chrome::kChromeUIUberURL) +
-          chrome::kChromeUISettingsHost + '/' + sub_page;
-    }
-    browser::NavigateParams params(GetSingletonTabNavigateParams(GURL(url)));
-    params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
-    ShowSingletonTabOverwritingNTP(params);
+    url = std::string(chrome::kChromeUIUberURL) +
+        chrome::kChromeUISettingsHost + '/' + sub_page;
   }
+  browser::NavigateParams params(GetSingletonTabNavigateParams(GURL(url)));
+  params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
+  ShowSingletonTabOverwritingNTP(params);
 }
 
 void Browser::OpenClearBrowsingDataDialog() {
   content::RecordAction(UserMetricsAction("ClearBrowsingData_ShowDlg"));
   ShowOptionsTab(chrome::kClearBrowserDataSubPage);
 }
 
 void Browser::OpenOptionsDialog() {
   content::RecordAction(UserMetricsAction("ShowOptions"));
   ShowOptionsTab("");
 }
 
 void Browser::OpenPasswordManager() {
   content::RecordAction(UserMetricsAction("Options_ShowPasswordManager"));
   ShowOptionsTab(chrome::kPasswordManagerSubPage);
 }
 
 void Browser::OpenImportSettingsDialog() {
   content::RecordAction(UserMetricsAction("Import_ShowDlg"));
   ShowOptionsTab(chrome::kImportDataSubPage);
 }
 
 void Browser::OpenInstantConfirmDialog() {
   ShowOptionsTab(chrome::kInstantConfirmPage);
 }
 
 void Browser::OpenAboutChromeDialog() {
   content::RecordAction(UserMetricsAction("AboutChrome"));
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableUberPage)) {
-#if defined(OS_CHROMEOS)
-    std::string chrome_settings(chrome::kChromeUISettingsURL);
-    ShowSingletonTab(
-        GURL(chrome_settings.append(chrome::kAboutOptionsSubPage)));
+#if !defined(OS_WIN) && !defined(OS_MACOSX)
+  ShowSingletonTab(GURL(chrome::kChromeUIUberURL));
 #else
-    window_->ShowAboutChromeDialog();
+  // crbug.com/115123.
+  window_->ShowAboutChromeDialog();
 #endif

[csilv, 2012/03/22 19:41:02]

FYI, I commited a change for the Mac to use the web-ui about page.  That will
cause this CL to change slightly.

-  } else {
-#if !defined(OS_WIN) && !defined(OS_MACOSX)
-    ShowSingletonTab(GURL(chrome::kChromeUIUberURL));
-#else
-    // crbug.com/115123.
-    window_->ShowAboutChromeDialog();
-#endif
-  }
 }
 
 void Browser::OpenUpdateChromeDialog() {
   content::RecordAction(UserMetricsAction("UpdateChrome"));
   window_->ShowUpdateChromeDialog();
 }
 
 void Browser::ShowHelpTab() {
   content::RecordAction(UserMetricsAction("ShowHelpTab"));
   ShowSingletonTab(GURL(chrome::kChromeHelpURL));
@@ skipping 37 matching lines @@
 void Browser::Shutdown() {
   content::RecordAction(UserMetricsAction("Shutdown"));
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       RequestShutdown();
 }
 
 void Browser::OpenAdvancedOptionsDialog() {
   // TODO(csilv): The main purpose of this method is to expose the date & time
   // settings from the clock. Simply showing the options tab not quite enough.
   content::RecordAction(UserMetricsAction("OpenSystemOptionsDialog"));
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableUberPage))
-    ShowOptionsTab(chrome::kSystemOptionsSubPage);
-  else
-    ShowOptionsTab("");
+  ShowOptionsTab("");
 }
 
 void Browser::OpenInternetOptionsDialog() {
   content::RecordAction(UserMetricsAction("OpenInternetOptionsDialog"));
   ShowOptionsTab(chrome::kInternetOptionsSubPage);
 }
 
 void Browser::OpenLanguageOptionsDialog() {
   content::RecordAction(UserMetricsAction("OpenLanguageOptionsDialog"));
   ShowOptionsTab(chrome::kLanguageOptionsSubPage);
@@ skipping 1522 matching lines @@
 
 void Browser::ShowRepostFormWarningDialog(WebContents* source) {
   browser::ShowTabModalConfirmDialog(
       new RepostFormWarningController(source),
       TabContentsWrapper::GetCurrentWrapperForContents(source));
 }
 
 void Browser::ShowContentSettingsPage(ContentSettingsType content_type) {
   ShowOptionsTab(
       chrome::kContentSettingsExceptionsSubPage + std::string(kHashMark) +
-      ContentSettingsHandler::ContentSettingsTypeToGroupName(content_type));
+      options2::ContentSettingsHandler::ContentSettingsTypeToGroupName(
+          content_type));
 }
 
 void Browser::ShowCollectedCookiesDialog(TabContentsWrapper* wrapper) {
   browser::ShowCollectedCookiesDialog(window()->GetNativeHandle(), wrapper);
 }
 
 bool Browser::ShouldAddNavigationToHistory(
     const history::HistoryAddPageArgs& add_page_args,
     content::NavigationType navigation_type) {
   // Don't update history if running as app.
@@ skipping 1608 matching lines @@
   } else {
     LoginUIServiceFactory::GetForProfile(
         profile()->GetOriginalProfile())->ShowLoginUI(false);
   }
 #endif
 }
 
 void Browser::ToggleSpeechInput() {
   GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput();
 }