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

Unified Diff: chrome/browser/app_controller_mac.mm

Issue 102015: Add a very basic preferences window controller with unit test. Fix the prefs ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 8 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
Index: chrome/browser/app_controller_mac.mm
===================================================================
--- chrome/browser/app_controller_mac.mm (revision 14945)
+++ chrome/browser/app_controller_mac.mm (working copy)
@@ -13,6 +13,7 @@
#include "chrome/browser/browser_list.h"
#include "chrome/browser/browser_shutdown.h"
#import "chrome/browser/cocoa/bookmark_menu_bridge.h"
+#import "chrome/browser/cocoa/preferences_window_controller.h"
#include "chrome/browser/command_updater.h"
#include "chrome/browser/profile_manager.h"
#include "chrome/common/temp_scaffolding_stubs.h"
@@ -184,7 +185,7 @@
launch.OpenURLsInBrowser(BrowserList::GetLastActive(), false, urls);
}
-}
+} // namespace
- (void)getUrl:(NSAppleEventDescriptor*)event
withReply:(NSAppleEventDescriptor*)reply {
@@ -234,7 +235,12 @@
// Show the preferences window, or bring it to the front if it's already
// visible.
- (IBAction)showPreferences:(id)sender {
-// TODO(pinkerton): more goes here...
+ if (!prefsController_.get()) {
+ PrefService* prefs = [self defaultProfile]->GetPrefs();
+ prefsController_.reset([[PreferencesWindowController alloc]
+ initWithPrefs:prefs]);
+ }
+ [prefsController_ showPreferences:sender];
}
@end

Powered by Google App Engine
This is Rietveld 408576698