Alter the "get themes" action on Mac to behave like other platforms; fix bugs...

chrome/browser/cocoa/preferences_window_controller.mm

 // Copyright (c) 2010 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 "app/l10n_util_mac.h"
@@ skipping 1294 matching lines @@
   [ImportSettingsDialogController showImportSettingsDialogForProfile:profile_];
 }
 
 - (IBAction)resetThemeToDefault:(id)sender {
   [self recordUserAction:"Options_ThemesReset"];
   profile_->ClearTheme();
 }
 
 - (IBAction)themesGallery:(id)sender {
   [self recordUserAction:"Options_ThemesGallery"];
-  Browser* browser =
-      BrowserList::FindBrowserWithType(profile_, Browser::TYPE_NORMAL);
+  Browser* browser = BrowserList::GetLastActive();

[Avi (use Gerrit), 2010/03/23 16:24:14]

BTW, you don't have to worry about finding the "normal" (i.e. non-popup)
browser; opening a link in a popup will find the first non-popup. With this
change we behave like everyone else.

 
-  if (!browser || !browser->GetSelectedTabContents()) {
+  if (!browser || !browser->GetSelectedTabContents())
     browser = Browser::Create(profile_);
-    browser->OpenURL(
-        GURL(l10n_util::GetStringUTF8(IDS_THEMES_GALLERY_URL)),
-        GURL(), NEW_WINDOW, PageTransition::LINK);
-  } else {
-    browser->OpenURL(
-        GURL(l10n_util::GetStringUTF8(IDS_THEMES_GALLERY_URL)),
-        GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
-  }
+  browser->OpenThemeGalleryTabAndActivate();
 }
 
 // Called when the "stop syncing" confirmation dialog started by
 // doSyncAction is finished.  Stop syncing only If the user clicked
 // OK.
 - (void)stopSyncAlertDidEnd:(NSAlert*)alert
                  returnCode:(int)returnCode
                 contextInfo:(void*)contextInfo {
   DCHECK(syncService_);
   if (returnCode == NSAlertFirstButtonReturn) {
@@ skipping 608 matching lines @@
     case OPTIONS_PAGE_ADVANCED:
       return underTheHoodView_;
     case OPTIONS_PAGE_DEFAULT:
     case OPTIONS_PAGE_COUNT:
       LOG(DFATAL) << "Invalid page value " << page;
   }
   return basicsView_;
 }
 
 @end