Implemented ShowOptionsWindow() for OS X (except the highlighting

chrome/browser/app_controller_mac.mm

 // Copyright (c) 2009 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 "app/l10n_util_mac.h"
 #include "base/command_line.h"
 #include "base/mac_util.h"
 #include "base/message_loop.h"
@@ skipping 34 matching lines @@
 - (void)initMenuState;
 - (void)openURLs:(const std::vector<GURL>&)urls;
 - (void)openPendingURLs;
 - (void)getUrl:(NSAppleEventDescriptor*)event
      withReply:(NSAppleEventDescriptor*)reply;
 - (void)openFiles:(NSAppleEventDescriptor*)event
         withReply:(NSAppleEventDescriptor*)reply;
 - (void)windowLayeringDidChange:(NSNotification*)inNotification;
 - (BOOL)userWillWaitForInProgressDownloads:(int)downloadCount;
 - (BOOL)shouldQuitWithInProgressDownloads;
+- (void)showPreferencesWindow:(id)sender
+                         page:(OptionsPage)page
+                      profile:(Profile*)profile;
 @end
 
 // True while AppController is calling Browser::OpenEmptyWindow(). We need a
 // global flag here, analogue to BrowserInit::InProcessStartup() because
 // otherwise the SessionService will try to restore sessions when we make a new
 // window while there are no other active windows.
 static bool g_is_opening_new_window = false;
 
 @implementation AppController
 
@@ skipping 614 matching lines @@
   [[NSNotificationCenter defaultCenter]
     removeObserver:self
               name:kUserDoneEditingPrefsNotification
             object:prefsController_.get()];
   prefsController_.reset(NULL);
 }
 
 // Show the preferences window, or bring it to the front if it's already
 // visible.
 - (IBAction)showPreferences:(id)sender {
-  if (!prefsController_.get()) {
+  [self showPreferencesWindow:sender
+                         page:OPTIONS_PAGE_DEFAULT
+                      profile:[self defaultProfile]];
+}
+
+- (void)showPreferencesWindow:(id)sender
+                         page:(OptionsPage)page
+                      profile:(Profile*)profile {
+  if (prefsController_.get()) {
+    [prefsController_ switchToPage:page animate:YES];
+  } else {
     prefsController_.reset([[PreferencesWindowController alloc]
-                              initWithProfile:[self defaultProfile]]);
+                              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:kUserDoneEditingPrefsNotification
              object:prefsController_.get()];
   }
   [prefsController_ showPreferences:sender];
 }
@@ skipping 53 matching lines @@
   [item setTag:IDC_NEW_INCOGNITO_WINDOW];
   [dockMenu addItem:item];
 
   return dockMenu;
 }
 
 @end
 
 //---------------------------------------------------------------------------
 
-// Stub for cross-platform method that isn't called on Mac OS X.
 void ShowOptionsWindow(OptionsPage page,
                        OptionsGroup highlight_group,
                        Profile* profile) {
-  NOTIMPLEMENTED();
+  // TODO(akalin): Use highlight_group.
+  AppController* appController = [NSApp delegate];
+  [appController showPreferencesWindow:nil page:page profile:profile];
 }
 
 namespace app_controller_mac {
 
 bool IsOpeningNewWindow() {
   return g_is_opening_new_window;
 }
 
 }  // namespace app_controller_mac