Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3911)

Unified Diff: chrome/browser/app_controller_mac.mm

Issue 6621076: [Mac] Remove native/Cocoa preferences. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase switch removal Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/nibs/Preferences.xib ('k') | chrome/browser/autofill/autofill_address_model_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/app_controller_mac.mm
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 051d950d59dd44e159d23e6f4d0db1ab9b09359d..2535f4ef22d689a18971dbce6b0bf9e988a88674 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -17,6 +17,7 @@
#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"
@@ -33,12 +34,10 @@
#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"
@@ -151,9 +150,6 @@ void RecordLastRunAppBundlePath() {
- (void)checkForAnyKeyWindows;
- (BOOL)userWillWaitForInProgressDownloads:(int)downloadCount;
- (BOOL)shouldQuitWithInProgressDownloads;
-- (void)showPreferencesWindow:(id)sender
- page:(OptionsPage)page
- profile:(Profile*)profile;
- (void)executeApplication:(id)sender;
@end
@@ -1019,20 +1015,6 @@ void RecordLastRunAppBundlePath() {
[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 {
@@ -1045,26 +1027,6 @@ void RecordLastRunAppBundlePath() {
}
}
-- (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 {
@@ -1179,7 +1141,13 @@ void ShowOptionsWindow(OptionsPage page,
Profile* profile) {
// 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 {
« no previous file with comments | « chrome/app/nibs/Preferences.xib ('k') | chrome/browser/autofill/autofill_address_model_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698