commit 44517765148fbc1885574c598bcc58a39f852ba3
author jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Mar 09 02:04:05 2011
committer jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Mar 09 02:04:05 2011
tree 02da32234792793801e90fcc1a4e09e334a74cc7
parent 72b6fce5ede4eb5b5e0d73d308934009ed48bd2e

Options: Remove the kDisabledTabbedOptions flag.

BUG=75320
TEST=none

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

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

chrome/browser/app_controller_mac.mm

diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 85ddd87..051d950 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -762,32 +762,18 @@
       break;
     case IDC_CLEAR_BROWSING_DATA: {
       // There may not be a browser open, so use the default profile.
-      if (CommandLine::ForCurrentProcess()->HasSwitch(
-              switches::kDisableTabbedOptions)) {
-        [ClearBrowsingDataController
-            showClearBrowsingDialogForProfile:defaultProfile];
+      if (Browser* browser = ActivateBrowser(defaultProfile)) {
+        browser->OpenClearBrowsingDataDialog();
       } else {
-        if (Browser* browser = ActivateBrowser(defaultProfile)) {
-          browser->OpenClearBrowsingDataDialog();
-        } else {
-          Browser::OpenClearBrowingDataDialogWindow(defaultProfile);
-        }
+        Browser::OpenClearBrowingDataDialogWindow(defaultProfile);
       }
       break;
     }
     case IDC_IMPORT_SETTINGS: {
-      if (CommandLine::ForCurrentProcess()->HasSwitch(
-              switches::kDisableTabbedOptions)) {
-        UserMetrics::RecordAction(UserMetricsAction("Import_ShowDlg"),
-                                  defaultProfile);
-        [ImportDialogController
-            showImportSettingsDialogForProfile:defaultProfile];
+      if (Browser* browser = ActivateBrowser(defaultProfile)) {
+        browser->OpenImportSettingsDialog();
       } else {
-        if (Browser* browser = ActivateBrowser(defaultProfile)) {
-          browser->OpenImportSettingsDialog();
-        } else {
-          Browser::OpenImportSettingsDialogWindow(defaultProfile);
-        }
+        Browser::OpenImportSettingsDialogWindow(defaultProfile);
       }
       break;
     }
@@ -1050,19 +1036,12 @@
 // Show the preferences window, or bring it to the front if it's already
 // visible.
 - (IBAction)showPreferences:(id)sender {
-  const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
-  if (!parsed_command_line.HasSwitch(switches::kDisableTabbedOptions)) {
-    if (Browser* browser = ActivateBrowser([self defaultProfile])) {
-      // Show options tab in the active browser window.
-      browser->OpenOptionsDialog();
-    } else {
-      // No browser window, so create one for the options tab.
-      Browser::OpenOptionsWindow([self defaultProfile]);
-    }
+  if (Browser* browser = ActivateBrowser([self defaultProfile])) {
+    // Show options tab in the active browser window.
+    browser->OpenOptionsDialog();
   } else {
-    [self showPreferencesWindow:sender
-                           page:OPTIONS_PAGE_DEFAULT
-                        profile:[self defaultProfile]];
+    // No browser window, so create one for the options tab.
+    Browser::OpenOptionsWindow([self defaultProfile]);
   }
 }