[mac] Remember last used prefs tab.

chrome/browser/cocoa/preferences_window_controller.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/cocoa/preferences_window_controller.h"
 
 #include <algorithm>
 #include "app/l10n_util.h"
 #include "base/mac_util.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #import "chrome/browser/cocoa/clear_browsing_data_controller.h"
 #import "chrome/browser/cocoa/custom_home_pages_model.h"
 #import "chrome/browser/cocoa/keyword_editor_cocoa_controller.h"
 #import "chrome/browser/cocoa/search_engine_list_model.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/dns_global.h"
 #include "chrome/browser/net/url_fixer_upper.h"
+#include "chrome/browser/options_window.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/session_startup_pref.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
@@ skipping 166 matching lines @@
 
   // Put the advanced view into the scroller and scroll it to the top.
   [advancedScroller_ setDocumentView:advancedView_];
   [advancedView_ scrollPoint:NSMakePoint(0, advancedContentSize.height)];
 
   // Adjust the view origins so they show up centered.
   CenterViewForWidth(basicsView_, widest);
   CenterViewForWidth(personalStuffView_, widest);
   CenterViewForWidth(underTheHoodView_, widest);
 
-  // Ensure the "basics" is selected.
-  // TODO: change this to remember what's selected in a preference and restore
-  // it.
+  // Get the last visited page from local state.
+  OptionsPage page = static_cast<OptionsPage>(lastSelectedPage_.GetValue());
+  if (page == OPTIONS_PAGE_DEFAULT)
+    page = OPTIONS_PAGE_GENERAL;
 
-  NSToolbarItem* firstItem = [[toolbar_ items] objectAtIndex:0];
+  NSUInteger pageIndex = (NSUInteger)page;
+  if (pageIndex >= [[toolbar_ items] count])
+    pageIndex = 0;
+  NSToolbarItem* firstItem = [[toolbar_ items] objectAtIndex:pageIndex];
   [self displayPreferenceViewForToolbarItem:firstItem animate:NO];
   [toolbar_ setSelectedItemIdentifier:[firstItem itemIdentifier]];
 
   // TODO(pinkerton): save/restore position based on prefs.
   [[self window] center];
 }
 
 - (void)dealloc {
   [customPagesSource_ removeObserver:self forKeyPath:@"customHomePages"];
   [[NSNotificationCenter defaultCenter] removeObserver:self];
@@ skipping 43 matching lines @@
   // know it's there).
   PrefService* local = g_browser_process->local_state();
   if (!local)
     local = prefs_;
   metricsRecording_.Init(prefs::kMetricsReportingEnabled,
                          local, observer_.get());
   cookieBehavior_.Init(prefs::kCookieBehavior, prefs_, observer_.get());
   defaultDownloadLocation_.Init(prefs::kDownloadDefaultDirectory, prefs_,
                                 observer_.get());
   askForSaveLocation_.Init(prefs::kPromptForDownload, prefs_, observer_.get());
+
+  // We don't need to observe changes in this value.
+  lastSelectedPage_.Init(prefs::kOptionsWindowLastTabIndex, local, NULL);
 }
 
 // Clean up what was registered in -registerPrefObservers. We only have to
 // clean up the non-PrefMember registrations.
 - (void)unregisterPrefObservers {
   if (!prefs_) return;
 
   // Basics
   prefs_->RemovePrefObserver(prefs::kURLsToRestoreOnStartup, observer_.get());
 
@@ skipping 556 matching lines @@
 - (IBAction)toolbarButtonSelected:(id)sender {
   DCHECK([sender isKindOfClass:[NSToolbarItem class]]);
   [self displayPreferenceViewForToolbarItem:sender
                                     animate:YES];
 }
 
 // Helper to update the window to display a preferences view for a toolbaritem.
 - (void)displayPreferenceViewForToolbarItem:(NSToolbarItem*)toolbarItem
                                     animate:(BOOL)animate {
   NSView* prefsView = NULL;
+  OptionsPage page = OPTIONS_PAGE_DEFAULT;
   // Tags are set in the nib file.
   switch ([toolbarItem tag]) {
     case 0:  // Basics
       prefsView = basicsView_;
+      page = OPTIONS_PAGE_GENERAL;
       break;
     case 1:  // Personal Stuff
       prefsView = personalStuffView_;
+      page = OPTIONS_PAGE_CONTENT;
       break;
     case 2:  // Under the Hood
       prefsView = underTheHoodView_;
+      page = OPTIONS_PAGE_ADVANCED;
       break;
     default:
       NOTIMPLEMENTED();
   }
 
   NSWindow* prefsWindow = [self window];
   NSView* contentView = [prefsWindow contentView];
 
   // Normally there is only one view, but if the user clicks really quickly, the
   // animation could still been running, and the last view is the one that was
   // animating in.
   NSArray* subviews = [contentView subviews];
   NSView* currentPrefsView = nil;
   if ([subviews count]) {
     currentPrefsView = [subviews lastObject];
   }
 
   // Make sure we aren't being told to display the same thing again.
   if (currentPrefsView == prefsView) {
     return;
   }
 
+  // Remember new options page as current page.
+  if (page != OPTIONS_PAGE_DEFAULT)
+    lastSelectedPage_.SetValue(page);
+
   // Stop any running animation, and remove any past views that were on the way
   // out.
   [animation_ stopAnimation];
   if ([subviews count]) {
     RemoveAllButLastView(subviews);
   }
 
   NSRect prefsViewFrame = [prefsView frame];
   NSRect contentViewFrame = [contentView frame];
   if (animate) {
@@ skipping 246 matching lines @@
   [[NSNotificationCenter defaultCenter]
       postNotificationName:kUserDoneEditingPrefsNotification
                     object:self];
 }
 
 - (void)controlTextDidEndEditing:(NSNotification*)notification {
   [customPagesSource_ validateURLs];
 }
 
 @end