[Mac] Remove native/Cocoa preferences.

chrome/browser/app_controller_mac.mm

 // Copyright (c) 2011 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.
 
 #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"
 #include "base/string_number_conversions.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/background_application_list_model.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/download/download_manager.h"
+#include "chrome/browser/fonts_languages_window.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/sync/sync_ui_util_mac.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_init.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/about_window_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/bug_report_window_controller.h"
-#import "chrome/browser/ui/cocoa/clear_browsing_data_controller.h"
 #import "chrome/browser/ui/cocoa/confirm_quit_panel_controller.h"
 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h"
 #import "chrome/browser/ui/cocoa/history_menu_bridge.h"
 #import "chrome/browser/ui/cocoa/importer/import_dialog_cocoa.h"
-#import "chrome/browser/ui/cocoa/options/preferences_window_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"
 #include "chrome/browser/ui/cocoa/task_manager_mac.h"
 #include "chrome/browser/ui/options/options_window.h"
 #include "chrome/common/app_mode_common_mac.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
@@ skipping 92 matching lines @@
 @interface AppController(Private)
 - (void)initMenuState;
 - (void)registerServicesMenuTypesTo:(NSApplication*)app;
 - (void)openUrls:(const std::vector<GURL>&)urls;
 - (void)getUrl:(NSAppleEventDescriptor*)event
      withReply:(NSAppleEventDescriptor*)reply;
 - (void)windowLayeringDidChange:(NSNotification*)inNotification;
 - (void)checkForAnyKeyWindows;
 - (BOOL)userWillWaitForInProgressDownloads:(int)downloadCount;
 - (BOOL)shouldQuitWithInProgressDownloads;
-- (void)showPreferencesWindow:(id)sender
-                         page:(OptionsPage)page
-                      profile:(Profile*)profile;
 - (void)executeApplication:(id)sender;
 @end
 
 @implementation AppController
 
 @synthesize startupComplete = startupComplete_;
 
 // This method is called very early in application startup (ie, before
 // the profile is loaded or any preferences have been registered). Defer any
 // user-data initialization until -applicationDidFinishLaunching:.
@@ skipping 588 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.
-      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;
     }
     case IDC_SHOW_BOOKMARK_MANAGER:
       UserMetrics::RecordAction(UserMetricsAction("ShowBookmarkManager"),
                                 defaultProfile);
       if (Browser* browser = ActivateBrowser(defaultProfile)) {
         // Open a bookmark manager tab.
         browser->OpenBookmarkManager();
       } else {
@@ skipping 225 matching lines @@
     gurlVector.push_back(gurl);
   }
   if (!gurlVector.empty())
     [self openUrls:gurlVector];
   else
     NOTREACHED() << "Nothing to open!";
 
   [sender replyToOpenOrPrint:NSApplicationDelegateReplySuccess];
 }
 
-// Called when the preferences window is closed. We use this to release the
-// window controller.
-- (void)prefsWindowClosed:(NSNotification*)notification {
-  NSWindow* window = [prefsController_ window];
-  DCHECK_EQ([notification object], window);
-  NSNotificationCenter* defaultCenter = [NSNotificationCenter defaultCenter];
-  [defaultCenter removeObserver:self
-                           name:NSWindowWillCloseNotification
-                         object:window];
-  // PreferencesWindowControllers are autoreleased in
-  // -[PreferencesWindowController windowWillClose:].
-  prefsController_ = nil;
-}
-
 // 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]);
   }
 }
 
-- (void)showPreferencesWindow:(id)sender
-                         page:(OptionsPage)page
-                      profile:(Profile*)profile {
-  if (prefsController_) {
-    [prefsController_ switchToPage:page animate:YES];
-  } else {
-    prefsController_ =
-        [[PreferencesWindowController alloc] initWithProfile:profile
-                                                 initialPage:page];
-    // Watch for a notification of when it goes away so that we can destroy
-    // the controller.
-    [[NSNotificationCenter defaultCenter]
-        addObserver:self
-           selector:@selector(prefsWindowClosed:)
-               name:NSWindowWillCloseNotification
-             object:[prefsController_ window]];
-  }
-  [prefsController_ showPreferences:sender];
-}
-
 // Called when the about window is closed. We use this to release the
 // window controller.
 - (void)aboutWindowClosed:(NSNotification*)notification {
   NSWindow* window = [aboutController_ window];
   DCHECK_EQ([notification object], window);
   [[NSNotificationCenter defaultCenter]
       removeObserver:self
                 name:NSWindowWillCloseNotification
               object:window];
   // AboutWindowControllers are autoreleased in
@@ skipping 92 matching lines @@
   startupUrls_.clear();
 }
 
 @end  // @implementation AppController
 
 //---------------------------------------------------------------------------
 
 void ShowOptionsWindow(OptionsPage page,
                        OptionsGroup highlight_group,
                        Profile* profile) {
+  const char* theSwitch = switches::kDisableTabbedOptions;
+  if (CommandLine::ForCurrentProcess()->HasSwitch(theSwitch)) {
+    NSRunCriticalAlertPanel(
+        @"Ooops! No preferences!",
+        [NSString stringWithFormat:@"You launched chrome with --%s, which "
+            @"disables the Preferences system. Did you really mean to do that? "
+            @"You should relaunch without that flag if you want to change "
+            @"settings.", theSwitch],
+        @"OK",
+        nil,
+        nil);
+    return;
+  }
   // TODO(akalin): Use highlight_group.
   AppController* appController = [NSApp delegate];
-  [appController showPreferencesWindow:nil page:page profile:profile];
+  [appController showPreferences:nil];
+}
+
+void ShowFontsLanguagesWindow(gfx::NativeWindow window,
+                              FontsLanguagesPage page,
+                              Profile* profile) {
+  NOTIMPLEMENTED();
 }
 
 namespace app_controller_mac {
 
 bool IsOpeningNewWindow() {
   return g_is_opening_new_window;
 }
 
 }  // namespace app_controller_mac