Merge 62408 - Fixes bugs in usage of adding a new tab with a disposition of...

chrome/browser/cocoa/about_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/about_window_controller.h"
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/mac_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/browser_window.h"
 #include "chrome/browser/platform_util.h"
 #import "chrome/browser/cocoa/background_tile_view.h"
 #import "chrome/browser/cocoa/keystone_glue.h"
 #include "chrome/browser/cocoa/restart_browser.h"
 #include "chrome/common/url_constants.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/locale_settings.h"
 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
@@ skipping 587 matching lines @@
   [updateNowButton_ setEnabled:enableUpdateButton];
   [promoteButton_ setEnabled:enablePromoteButton];
 }
 
 - (BOOL)textView:(NSTextView *)aTextView
    clickedOnLink:(id)link
          atIndex:(NSUInteger)charIndex {
   // We always create a new window, so there's no need to try to re-use
   // an existing one just to pass in the NEW_WINDOW disposition.
   Browser* browser = Browser::Create(profile_);
-  if (browser) {
-    browser->OpenURL(GURL([link UTF8String]), GURL(), NEW_WINDOW,
-                     PageTransition::LINK);
-  }
+  browser->OpenURL(GURL([link UTF8String]), GURL(), NEW_FOREGROUND_TAB,
+                   PageTransition::LINK);
+  browser->window()->Show();
   return YES;
 }
 
 - (NSTextView*)legalText {
   return legalText_;
 }
 
 - (NSButton*)updateButton {
   return updateNowButton_;
 }
@@ skipping 115 matching lines @@
   NSRange string_range = NSMakeRange(0, [legal_block length]);
   [legal_block addAttribute:NSFontAttributeName
                       value:[NSFont labelFontOfSize:11]
                       range:string_range];
 
   [legal_block endEditing];
   return legal_block;
 }
 
 @end  // @implementation AboutWindowController