Fix DOMUI pref mode handling of Mac menu items

chrome/browser/app_controller_mac.mm

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.

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

bump copyright, here and others.

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

Done.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/app_controller_mac.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/mac/mac_util.h"
 #include "base/message_loop.h"
@@ skipping 829 matching lines @@
       Browser::OpenEmptyWindow(defaultProfile->GetOffTheRecordProfile());
       break;
     case IDC_RESTORE_TAB:
       Browser::OpenWindowWithRestoredTabs(defaultProfile);
       break;
     case IDC_OPEN_FILE:
       CreateBrowser(defaultProfile)->ExecuteCommand(IDC_OPEN_FILE);
       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:
       UserMetrics::RecordAction(UserMetricsAction("ShowBookmarkManager"),
                                 defaultProfile);
       if (Browser* browser = ActivateBrowser(defaultProfile)) {
         // Open a bookmark manager tab.
         browser->OpenBookmarkManager();
       } else {
         // No browser window, so create one for the bookmark manager tab.
@@ skipping 28 matching lines @@
       Browser* browser = BrowserList::GetLastActive();
       TabContents* currentTab =
           browser ? browser->GetSelectedTabContents() : NULL;
       BugReportWindowController* controller =
           [[BugReportWindowController alloc]
               initWithTabContents:currentTab
                           profile:[self defaultProfile]];
       [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 .
       //
       // TODO(akalin,viettrungluu): Figure out whether this method can
       // be prevented from being called if defaultProfile is NULL.
       if (!defaultProfile) {
         LOG(WARNING) << "NULL defaultProfile detected -- not doing anything";
         break;
       }
       // 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);
       TaskManagerMac::Show();
       break;
     case IDC_OPTIONS:
       [self showPreferences:sender];
       break;
     default:
       // Background Applications use dynamic values that must be less than the
@@ skipping 337 matching lines @@
   [appController showPreferencesWindow:nil page:page profile:profile];
 }
 
 namespace app_controller_mac {
 
 bool IsOpeningNewWindow() {
   return g_is_opening_new_window;
 }
 
 }  // namespace app_controller_mac