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

chrome/browser/task_manager/task_manager.cc

 // 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.
 
 #include "chrome/browser/task_manager/task_manager.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/number_formatting.h"
@@ skipping 926 matching lines @@
   Browser* browser = BrowserList::GetLastActive();
 
   if (!browser) {
     // On OS X, the task manager can be open without any open browser windows.
     if (!g_browser_process ||
         !g_browser_process->profile_manager() ||
         g_browser_process->profile_manager()->begin() ==
             g_browser_process->profile_manager()->end())
       return;
     browser = Browser::Create(*g_browser_process->profile_manager()->begin());
-    browser->OpenURL(GURL(chrome::kAboutMemoryURL), GURL(), NEW_WINDOW,
+    browser->OpenURL(GURL(chrome::kAboutMemoryURL), GURL(), NEW_FOREGROUND_TAB,
                      PageTransition::LINK);
+    browser->window()->Show();
   } else {
     browser->OpenURL(GURL(chrome::kAboutMemoryURL), GURL(), NEW_FOREGROUND_TAB,
                      PageTransition::LINK);
 
     // In case the browser window is minimzed, show it. If |browser| is a
     // non-tabbed window, the call to OpenURL above will have opened a
     // TabContents in a tabbed browser, so we need to grab it with GetLastActive
     // before the call to show().
     if (browser->type() & (Browser::TYPE_APP |
                            Browser::TYPE_DEVTOOLS |
@@ skipping 12 matching lines @@
   MetricsMap::const_iterator iter = metrics_map_.find(handle);
   if (iter == metrics_map_.end())
     return false;
 
   if (!iter->second->GetMemoryBytes(&usage->first, &usage->second))
     return false;
 
   memory_usage_map_.insert(std::make_pair(handle, *usage));
   return true;
 }