Fix DOMUI pref mode handling of Mac menu items

chrome/browser/app_controller_mac.mm

Index: chrome/browser/app_controller_mac.mm
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 058ed166f5b564cf2c596ba49f4b0b17d609f76d..7fcb9fd62a73b2379a7b27ee6658f784c9018b43 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -848,15 +848,33 @@ void RecordLastRunAppBundlePath() {
       break;
     case IDC_CLEAR_BROWSING_DATA: {
       // There may not be a browser open, so use the default profile.
-      [ClearBrowsingDataController
-          showClearBrowsingDialogForProfile:defaultProfile];
+      if (CommandLine::ForCurrentProcess()->HasSwitch(
+              switches::kDisableTabbedOptions)) {
+        [ClearBrowsingDataController
+            showClearBrowsingDialogForProfile:defaultProfile];
+      } else {
+        if (Browser* browser = ActivateBrowser(defaultProfile)) {
+          browser->OpenClearBrowsingDataDialog();
+        } else {
+          Browser::OpenClearBrowingDataDialogWindow(defaultProfile);
+        }
+      }
       break;
     }
     case IDC_IMPORT_SETTINGS: {
-      UserMetrics::RecordAction(UserMetricsAction("Import_ShowDlg"),
-                                defaultProfile);
-      [ImportSettingsDialogController
-          showImportSettingsDialogForProfile:defaultProfile];
+      if (CommandLine::ForCurrentProcess()->HasSwitch(
+              switches::kDisableTabbedOptions)) {
+        UserMetrics::RecordAction(UserMetricsAction("Import_ShowDlg"),
+                                  defaultProfile);
+        [ImportSettingsDialogController
+            showImportSettingsDialogForProfile:defaultProfile];
+      } else {
+        if (Browser* browser = ActivateBrowser(defaultProfile)) {
+          browser->OpenClearBrowsingDataDialog();

[csilv, 2011/01/25 00:33:50]

Should be calling OpenImportSettingsDialog();

[stuartmorgan, 2011/01/25 01:08:43]

Whoops! Apparently I wasn't looking carefully at the dialog that came up. Done.

+        } else {
+          Browser::OpenClearBrowingDataDialogWindow(defaultProfile);

[csilv, 2011/01/25 00:33:50]

Should be calling OpenImportSettingsDialogWindow().

[stuartmorgan, 2011/01/25 01:08:43]

Done.

+        }
+      }
       break;
     }
     case IDC_SHOW_BOOKMARK_MANAGER:
@@ -905,7 +923,7 @@ void RecordLastRunAppBundlePath() {
       [controller runModalDialog];
       break;
     }
-    case IDC_SYNC_BOOKMARKS:
+    case IDC_SYNC_BOOKMARKS: {

[csilv, 2011/01/25 00:33:50]

Any particular reason for adding the brackets to this block?  Just curious.

[stuartmorgan, 2011/01/25 01:08:43]

It's cruft from an earlier iteration of the change where I added a variable
declaration, so needed scope. Removed.

       // The profile may be NULL during shutdown -- see
       // http://code.google.com/p/chromium/issues/detail?id=43048 .
       //
@@ -918,8 +936,10 @@ void RecordLastRunAppBundlePath() {
       // TODO(akalin): Add a constant to denote starting sync from the
       // main menu and use that instead of START_FROM_WRENCH.
       sync_ui_util::OpenSyncMyBookmarksDialog(
-          defaultProfile, ProfileSyncService::START_FROM_WRENCH);
+          defaultProfile, ActivateBrowser(defaultProfile),
+          ProfileSyncService::START_FROM_WRENCH);
       break;
+    }
     case IDC_TASK_MANAGER:
       UserMetrics::RecordAction(UserMetricsAction("TaskManager"),
                                 defaultProfile);