Remove last remaining call to FindOrCreateTabbedBrowser(). Fix up presubmit check.

BUG=129187
TEST=NONE


Review URL: https://chromiumcodereview.appspot.com/11554003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174348 0039d316-1c4b-4281-b951-d872f2087c98

23 files changed, 85 insertions, 78 deletions

diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 05e3070..34ab6be 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -171,16 +171,6 @@ _BANNED_CPP_FUNCTIONS = (
       False,
       (),
     ),
-    (
-      'browser::FindOrCreateTabbedBrowserDeprecated',
-      (
-       'This function is deprecated and we\'re working on removing it. Pass',
-       'more context to get a Browser*, like a WebContents, window, or session',
-       'id. Talk to robertshield@ for more information.',
-      ),
-      True,
-      (),
-    ),
 )
 
 
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index b67a1a2..68f1015 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -1776,7 +1776,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
 // See crbug.com/131836.
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderTaskManager) {
   // Show the task manager. This populates the model.
-  current_browser()->window()->ShowTaskManager();
+  current_browser()->window()->ShowTaskManager(
+      chrome::HOST_DESKTOP_TYPE_NATIVE);
   // Wait for the model of task manager to start.
   TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
 
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
index 785f0df..489b48a 100644
--- a/chrome/browser/task_manager/task_manager.cc
+++ b/chrome/browser/task_manager/task_manager.cc
@@ -1278,10 +1278,9 @@ TaskManager* TaskManager::GetInstance() {
   return Singleton<TaskManager>::get();
 }
 
-void TaskManager::OpenAboutMemory() {
-  // TODO(robertshield): FTB - Merge MAD's TaskManager change.
-  Browser* browser = browser::FindOrCreateTabbedBrowserDeprecated(
-      ProfileManager::GetDefaultProfileOrOffTheRecord());
+void TaskManager::OpenAboutMemory(chrome::HostDesktopType desktop_type) {
+  Browser* browser = browser::FindOrCreateTabbedBrowser(
+      ProfileManager::GetDefaultProfileOrOffTheRecord(), desktop_type);
   chrome::NavigateParams params(browser, GURL(chrome::kChromeUIMemoryURL),
                                 content::PAGE_TRANSITION_LINK);
   params.disposition = NEW_FOREGROUND_TAB;
diff --git a/chrome/browser/task_manager/task_manager.h b/chrome/browser/task_manager/task_manager.h
index 5ac34c4b..cb313de 100644
--- a/chrome/browser/task_manager/task_manager.h
+++ b/chrome/browser/task_manager/task_manager.h
@@ -18,6 +18,7 @@
 #include "base/string16.h"
 #include "base/timer.h"
 #include "chrome/browser/renderer_host/web_cache_manager.h"
+#include "chrome/browser/ui/host_desktop.h"
 #include "content/public/common/gpu_memory_stats.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
 
@@ -216,7 +217,7 @@ class TaskManager {
 
   TaskManagerModel* model() const { return model_.get(); }
 
-  void OpenAboutMemory();
+  void OpenAboutMemory(chrome::HostDesktopType desktop_type);
 
   // Returns the number of background pages that will be displayed in the
   // TaskManager. Used by the wrench menu code to display a count of background
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc
index 3bdc277..af2454f 100644
--- a/chrome/browser/task_manager/task_manager_browsertest.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest.cc
@@ -88,7 +88,7 @@ class TaskManagerBrowserTest : public ExtensionBrowserTest {
 
 // Regression test for http://crbug.com/13361
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, MAYBE_ShutdownWhileOpen) {
-  browser()->window()->ShowTaskManager();
+  browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
 }
 
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeTabContentsChanges) {
@@ -96,7 +96,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeTabContentsChanges) {
 
   // Show the task manager. This populates the model, and helps with debugging
   // (you see the task manager).
-  browser()->window()->ShowTaskManager();
+  browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
 
   // New Tab Page.
   TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
@@ -136,7 +136,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, MAYBE_NoticePanelChanges) {
 
   // Show the task manager. This populates the model, and helps with debugging
   // (you see the task manager).
-  browser()->window()->ShowTaskManager();
+  browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
 
   // New Tab Page.
   TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
@@ -183,7 +183,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeBGContentsChanges) {
 
   // Show the task manager. This populates the model, and helps with debugging
   // (you see the task manager).
-  browser()->window()->ShowTaskManager();
+  browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
 
   // New Tab Page.
   TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
@@ -214,7 +214,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, KillBGContents) {
 
   // Show the task manager. This populates the model, and helps with debugging
   // (you see the task manager).
-  browser()->window()->ShowTaskManager();
+  browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
 
   // New Tab Page.
   TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
@@ -270,7 +270,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, MAYBE_KillPanelExtension) {
 
   // Show the task manager. This populates the model, and helps with debugging
   // (you see the task manager).
-  browser()->window()->ShowTaskManager();
+  browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
 
   // New Tab Page.
   TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
@@ -309,7 +309,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeExtensionChanges) {
 
   // Show the task manager. This populates the model, and helps with debugging
   // (you see the task manager).
-  browser()->window()->ShowTaskManager();
+  browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
 
   // New Tab Page.
   TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
@@ -330,7 +330,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeExtensionChanges) {
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeExtensionTabs) {
   // Show the task manager. This populates the model, and helps with debugging
   // (you see the task manager).
-  browser()->window()->ShowTaskManager();
+  browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
   // Wait for loading of task manager.
   TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
 
@@ -376,7 +376,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeExtensionTabs) {
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeAppTabs) {
   // Show the task manager. This populates the model, and helps with debugging
   // (you see the task manager).
-  browser()->window()->ShowTaskManager();
+  browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
   // Wait for loading of task manager.
   TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
 
@@ -415,7 +415,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeAppTabs) {
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeHostedAppTabs) {
   // Show the task manager. This populates the model, and helps with debugging
   // (you see the task manager).
-  browser()->window()->ShowTaskManager();
+  browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
 
   // New Tab Page.
   TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
@@ -473,7 +473,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, MAYBE_KillExtension) {
   EXPECT_EQ(0, TaskManager::GetBackgroundPageCount());
   // Show the task manager. This populates the model, and helps with debugging
   // (you see the task manager).
-  browser()->window()->ShowTaskManager();
+  browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
   // Wait for loading of task manager.
   TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
 
@@ -502,7 +502,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest,
                        DISABLED_KillExtensionAndReload) {
   // Show the task manager. This populates the model, and helps with debugging
   // (you see the task manager).
-  browser()->window()->ShowTaskManager();
+  browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
   // Wait for loading of task manager.
   TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
 
@@ -545,7 +545,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest,
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, MAYBE_ReloadExtension) {
   // Show the task manager. This populates the model, and helps with debugging
   // (you see the task manager).
-  browser()->window()->ShowTaskManager();
+  browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
   // Wait for loading of task manager.
   TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
 
@@ -593,7 +593,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest,
 
   // Show the task manager. This populates the model, and helps with debugging
   // (you see the task manager).
-  browser()->window()->ShowTaskManager();
+  browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
 
   // New Tab Page.
   TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
diff --git a/chrome/browser/task_manager/task_manager_browsertest_util.cc b/chrome/browser/task_manager/task_manager_browsertest_util.cc
index f2293a0..48fe9ab 100644
--- a/chrome/browser/task_manager/task_manager_browsertest_util.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest_util.cc
@@ -100,10 +100,10 @@ void TaskManagerBrowserTestUtil::ShowTaskManagerAndWaitForReady(
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_TASK_MANAGER_WINDOW_READY,
       content::Source<TaskManagerModel>(TaskManager::GetInstance()->model()));
-  browser->window()->ShowTaskManager();
+  browser->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
   observer.Wait();
 #else
-  browser->window()->ShowTaskManager();
+  browser->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
 #endif  // defined(USE_AURA)
 }
 
diff --git a/chrome/browser/task_manager/task_manager_notification_browsertest.cc b/chrome/browser/task_manager/task_manager_notification_browsertest.cc
index 43756a5..772526d 100644
--- a/chrome/browser/task_manager/task_manager_notification_browsertest.cc
+++ b/chrome/browser/task_manager/task_manager_notification_browsertest.cc
@@ -50,7 +50,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerNotificationBrowserTest,
   EXPECT_EQ(0, model()->ResourceCount());
 
   // Show the task manager.
-  browser()->window()->ShowTaskManager();
+  browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
   // Expect to see the browser and the New Tab Page renderer.
   TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
 
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index e657147a..67f4810 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -876,9 +876,9 @@ bool CanOpenTaskManager() {
 void OpenTaskManager(Browser* browser, bool highlight_background_resources) {
   content::RecordAction(UserMetricsAction("TaskManager"));
   if (highlight_background_resources)
-    browser->window()->ShowBackgroundPages();
+    browser->window()->ShowBackgroundPages(browser->host_desktop_type());
   else
-    browser->window()->ShowTaskManager();
+    browser->window()->ShowTaskManager(browser->host_desktop_type());
 }
 
 void OpenFeedbackDialog(Browser* browser) {
diff --git a/chrome/browser/ui/browser_finder.cc b/chrome/browser/ui/browser_finder.cc
index 17141a5..3c7c1d5 100644
--- a/chrome/browser/ui/browser_finder.cc
+++ b/chrome/browser/ui/browser_finder.cc
@@ -135,10 +135,6 @@ Browser* FindTabbedBrowser(Profile* profile,
                                         match_original_profiles);
 }
 
-Browser* FindOrCreateTabbedBrowserDeprecated(Profile* profile) {
-  return FindOrCreateTabbedBrowser(profile, chrome::HOST_DESKTOP_TYPE_NATIVE);
-}
-
 Browser* FindOrCreateTabbedBrowser(Profile* profile,
                                    chrome::HostDesktopType type) {
   Browser* browser = FindTabbedBrowser(profile, false, type);
diff --git a/chrome/browser/ui/browser_finder.h b/chrome/browser/ui/browser_finder.h
index a07353f..827c3c6 100644
--- a/chrome/browser/ui/browser_finder.h
+++ b/chrome/browser/ui/browser_finder.h
@@ -30,9 +30,6 @@ Browser* FindTabbedBrowser(Profile* profile,
                            bool match_original_profiles,
                            chrome::HostDesktopType type);
 
-// Deprecated. Call FindOrCreateTabbedBrowser and pass a desktop type instead.
-Browser* FindOrCreateTabbedBrowserDeprecated(Profile* profile);
-
 // Returns the first tabbed browser matching |profile|. If there is no tabbed
 // browser a new one is created and returned for the desktop specified by
 // |type|. If a new browser is created it is not made visible.
diff --git a/chrome/browser/ui/browser_window.h b/chrome/browser/ui/browser_window.h
index 75dc7d7..0bf68d3 100644
--- a/chrome/browser/ui/browser_window.h
+++ b/chrome/browser/ui/browser_window.h
@@ -10,6 +10,7 @@
 #include "chrome/browser/ui/base_window.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
 #include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h"
+#include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/sync/one_click_signin_sync_starter.h"
 #include "chrome/common/content_settings_types.h"
 #include "ui/gfx/native_widget_types.h"
@@ -200,10 +201,10 @@ class BrowserWindow : public BaseWindow {
   virtual void ShowUpdateChromeDialog() = 0;
 
   // Shows the Task manager.
-  virtual void ShowTaskManager() = 0;
+  virtual void ShowTaskManager(chrome::HostDesktopType desktop_type) = 0;
 
   // Shows task information related to background pages.
-  virtual void ShowBackgroundPages() = 0;
+  virtual void ShowBackgroundPages(chrome::HostDesktopType desktop_type) = 0;
 
   // Shows the Bookmark bubble. |url| is the URL being bookmarked,
   // |already_bookmarked| is true if the url is already bookmarked.
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.h b/chrome/browser/ui/cocoa/browser_window_cocoa.h
index 94cbe9a..6e14985 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.h
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.h
@@ -91,8 +91,9 @@ class BrowserWindowCocoa :
                                         Profile* profile) OVERRIDE;
   virtual void ToggleBookmarkBar() OVERRIDE;
   virtual void ShowUpdateChromeDialog() OVERRIDE;
-  virtual void ShowTaskManager() OVERRIDE;
-  virtual void ShowBackgroundPages() OVERRIDE;
+  virtual void ShowTaskManager(chrome::HostDesktopType desktop_type) OVERRIDE;
+  virtual void ShowBackgroundPages(
+      chrome::HostDesktopType desktop_type) OVERRIDE;
   virtual void ShowBookmarkBubble(const GURL& url,
                                   bool already_bookmarked) OVERRIDE;
   virtual void ShowChromeToMobileBubble() OVERRIDE;
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
index 7e65052..e09901b 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
@@ -450,11 +450,12 @@ void BrowserWindowCocoa::ShowUpdateChromeDialog() {
   restart_browser::RequestRestart(window());
 }
 
-void BrowserWindowCocoa::ShowTaskManager() {
+void BrowserWindowCocoa::ShowTaskManager(chrome::HostDesktopType desktop_type) {
   TaskManagerMac::Show(false);
 }
 
-void BrowserWindowCocoa::ShowBackgroundPages() {
+void BrowserWindowCocoa::ShowBackgroundPages(
+    chrome::HostDesktopType desktop_type) {
   TaskManagerMac::Show(true);
 }
 
diff --git a/chrome/browser/ui/cocoa/task_manager_mac.mm b/chrome/browser/ui/cocoa/task_manager_mac.mm
index af897c9..eecee3e 100644
--- a/chrome/browser/ui/cocoa/task_manager_mac.mm
+++ b/chrome/browser/ui/cocoa/task_manager_mac.mm
@@ -12,6 +12,7 @@
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #import "chrome/browser/ui/cocoa/window_size_autosaver.h"
+#include "chrome/browser/ui/host_desktop.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ -182,7 +183,7 @@ class SortHelper {
 }
 
 - (IBAction)statsLinkClicked:(id)sender {
-  TaskManager::GetInstance()->OpenAboutMemory();
+  TaskManager::GetInstance()->OpenAboutMemory(chrome::HOST_DESKTOP_TYPE_NATIVE);
 }
 
 - (IBAction)killSelectedProcesses:(id)sender {
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index a9b5ec4..98be394 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -950,11 +950,12 @@ void BrowserWindowGtk::ShowUpdateChromeDialog() {
   UpdateRecommendedDialog::Show(window_);
 }
 
-void BrowserWindowGtk::ShowTaskManager() {
+void BrowserWindowGtk::ShowTaskManager(chrome::HostDesktopType desktop_type) {
   TaskManagerGtk::Show(false);
 }
 
-void BrowserWindowGtk::ShowBackgroundPages() {
+void BrowserWindowGtk::ShowBackgroundPages(
+    chrome::HostDesktopType desktop_type) {
   TaskManagerGtk::Show(true);
 }
 
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.h b/chrome/browser/ui/gtk/browser_window_gtk.h
index 1900b93..c11659a 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.h
+++ b/chrome/browser/ui/gtk/browser_window_gtk.h
@@ -19,6 +19,7 @@
 #include "chrome/browser/extensions/extension_keybinding_registry.h"
 #include "chrome/browser/infobars/infobar_container.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/ui_base_types.h"
@@ -126,8 +127,9 @@ class BrowserWindowGtk
                                         Profile* profile) OVERRIDE;
   virtual void ToggleBookmarkBar() OVERRIDE;
   virtual void ShowUpdateChromeDialog() OVERRIDE;
-  virtual void ShowTaskManager() OVERRIDE;
-  virtual void ShowBackgroundPages() OVERRIDE;
+  virtual void ShowTaskManager(chrome::HostDesktopType desktop_type) OVERRIDE;
+  virtual void ShowBackgroundPages(
+      chrome::HostDesktopType desktop_type) OVERRIDE;
   virtual void ShowBookmarkBubble(const GURL& url,
                                   bool already_bookmarked) OVERRIDE;
   virtual void ShowChromeToMobileBubble() OVERRIDE;
diff --git a/chrome/browser/ui/gtk/task_manager_gtk.cc b/chrome/browser/ui/gtk/task_manager_gtk.cc
index 1417cd4..21c1642 100644
--- a/chrome/browser/ui/gtk/task_manager_gtk.cc
+++ b/chrome/browser/ui/gtk/task_manager_gtk.cc
@@ -26,6 +26,7 @@
 #include "chrome/browser/ui/gtk/gtk_tree.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/menu_gtk.h"
+#include "chrome/browser/ui/host_desktop.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "grit/chromium_strings.h"
@@ -856,7 +857,7 @@ void TaskManagerGtk::ShowContextMenu(const gfx::Point& point,
 }
 
 void TaskManagerGtk::OnLinkActivated() {
-  task_manager_->OpenAboutMemory();
+  task_manager_->OpenAboutMemory(chrome::HOST_DESKTOP_TYPE_NATIVE);
 }
 
 gint TaskManagerGtk::CompareImpl(GtkTreeModel* model, GtkTreeIter* a,
diff --git a/chrome/browser/ui/views/browser_dialogs.h b/chrome/browser/ui/views/browser_dialogs.h
index 07ce2a8..26508c6 100644
--- a/chrome/browser/ui/views/browser_dialogs.h
+++ b/chrome/browser/ui/views/browser_dialogs.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_BROWSER_DIALOGS_H_
 #define CHROME_BROWSER_UI_VIEWS_BROWSER_DIALOGS_H_
 
+#include "chrome/browser/ui/host_desktop.h"
 #include "ui/gfx/native_widget_types.h"
 
 // This file contains functions for running a variety of browser dialogs and
@@ -65,10 +66,10 @@ void ShowPageInfoBubble(views::View* anchor_view,
 FindBar* CreateFindBar(BrowserView* browser_view);
 
 // Shows the Task Manager.
-void ShowTaskManager();
+void ShowTaskManager(chrome::HostDesktopType desktop_type);
 
 // Shows the Task Manager, highlighting the background pages.
-void ShowBackgroundPages();
+void ShowBackgroundPages(chrome::HostDesktopType desktop_type);
 
 // Shows a dialog box that allows a search engine to be edited. |template_url|
 // is the search engine being edited. If it is NULL, then the dialog will add a
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 532e1317..19bda98 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1284,19 +1284,19 @@ void BrowserView::ShowUpdateChromeDialog() {
   UpdateRecommendedMessageBox::Show(GetWidget()->GetNativeWindow());
 }
 
-void BrowserView::ShowTaskManager() {
+void BrowserView::ShowTaskManager(chrome::HostDesktopType desktop_type) {
 #if defined(USE_AURA)
   TaskManagerDialog::Show();
 #else
-  chrome::ShowTaskManager();
+  chrome::ShowTaskManager(desktop_type);
 #endif  // defined(USE_AURA)
 }
 
-void BrowserView::ShowBackgroundPages() {
+void BrowserView::ShowBackgroundPages(chrome::HostDesktopType desktop_type) {
 #if defined(USE_AURA)
   TaskManagerDialog::ShowBackgroundPages();
 #else
-  chrome::ShowBackgroundPages();
+  chrome::ShowBackgroundPages(desktop_type);
 #endif  // defined(USE_AURA)
 }
 
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
index 0b430f4..264b874 100644
--- a/chrome/browser/ui/views/frame/browser_view.h
+++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -304,8 +304,9 @@ class BrowserView : public BrowserWindow,
                                         Profile* profile) OVERRIDE;
   virtual void ToggleBookmarkBar() OVERRIDE;
   virtual void ShowUpdateChromeDialog() OVERRIDE;
-  virtual void ShowTaskManager() OVERRIDE;
-  virtual void ShowBackgroundPages() OVERRIDE;
+  virtual void ShowTaskManager(chrome::HostDesktopType desktop_type) OVERRIDE;
+  virtual void ShowBackgroundPages(
+      chrome::HostDesktopType desktop_type) OVERRIDE;
   virtual void ShowBookmarkBubble(const GURL& url,
                                   bool already_bookmarked) OVERRIDE;
   virtual void ShowBookmarkPrompt() OVERRIDE;
diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc
index c520868..7222dea 100644
--- a/chrome/browser/ui/views/task_manager_view.cc
+++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -15,6 +15,7 @@
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ -276,13 +277,15 @@ class TaskManagerView : public views::ButtonListener,
                         public views::ContextMenuController,
                         public views::Menu::Delegate {
  public:
-  explicit TaskManagerView(bool highlight_background_resources);
+  TaskManagerView(bool highlight_background_resources,
+                  chrome::HostDesktopType desktop_type);
   virtual ~TaskManagerView();
 
   // Shows the Task manager window, or re-activates an existing one. If
   // |highlight_background_resources| is true, highlights the background
   // resources in the resource display.
-  static void Show(bool highlight_background_resources);
+  static void Show(bool highlight_background_resources,
+                   chrome::HostDesktopType desktop_type);
 
   // views::View:
   virtual void Layout() OVERRIDE;
@@ -357,7 +360,10 @@ class TaskManagerView : public views::ButtonListener,
   bool is_always_on_top_;
 
   // True when the Task Manager should highlight background resources.
-  bool highlight_background_resources_;
+  const bool highlight_background_resources_;
+
+  // The host desktop type this task manager belongs to.
+  const chrome::HostDesktopType desktop_type_;
 
   // We need to own the text of the menu, the Windows API does not copy it.
   string16 always_on_top_menu_text_;
@@ -373,12 +379,14 @@ class TaskManagerView : public views::ButtonListener,
 TaskManagerView* TaskManagerView::instance_ = NULL;
 
 
-TaskManagerView::TaskManagerView(bool highlight_background_resources)
+TaskManagerView::TaskManagerView(bool highlight_background_resources,
+                                 chrome::HostDesktopType desktop_type)
     : purge_memory_button_(NULL),
       task_manager_(TaskManager::GetInstance()),
       model_(TaskManager::GetInstance()->model()),
       is_always_on_top_(false),
-      highlight_background_resources_(highlight_background_resources) {
+      highlight_background_resources_(highlight_background_resources),
+      desktop_type_(desktop_type) {
   Init();
 }
 
@@ -582,13 +590,15 @@ gfx::Size TaskManagerView::GetPreferredSize() {
 }
 
 // static
-void TaskManagerView::Show(bool highlight_background_resources) {
+void TaskManagerView::Show(bool highlight_background_resources,
+                           chrome::HostDesktopType desktop_type) {
   // In Windows Metro it's not good to open this native window.
   DCHECK(!win8::IsSingleWindowMetroMode());
 
   if (instance_) {
     if (instance_->highlight_background_resources_ !=
-        highlight_background_resources) {
+        highlight_background_resources ||
+        instance_->desktop_type_ != desktop_type) {
       instance_->GetWidget()->Close();
     } else {
       // If there's a Task manager window open already, just activate it.
@@ -596,7 +606,8 @@ void TaskManagerView::Show(bool highlight_background_resources) {
       return;
     }
   }
-  instance_ = new TaskManagerView(highlight_background_resources);
+  instance_ = new TaskManagerView(highlight_background_resources,
+                                  desktop_type);
   views::Widget::CreateWindow(instance_);
   instance_->InitAlwaysOnTopState();
   instance_->model_->StartUpdating();
@@ -710,7 +721,7 @@ void TaskManagerView::OnKeyDown(ui::KeyboardCode keycode) {
 
 void TaskManagerView::LinkClicked(views::Link* source, int event_flags) {
   DCHECK_EQ(about_memory_link_, source);
-  task_manager_->OpenAboutMemory();
+  task_manager_->OpenAboutMemory(desktop_type_);
 }
 
 void TaskManagerView::ShowContextMenuForView(views::View* source,
@@ -799,12 +810,12 @@ bool TaskManagerView::GetSavedAlwaysOnTopState(bool* always_on_top) const {
 namespace chrome {
 
 // Declared in browser_dialogs.h so others don't need to depend on our header.
-void ShowTaskManager() {
-  TaskManagerView::Show(false);
+void ShowTaskManager(chrome::HostDesktopType desktop_type) {
+  TaskManagerView::Show(false, desktop_type);
 }
 
-void ShowBackgroundPages() {
-  TaskManagerView::Show(true);
+void ShowBackgroundPages(chrome::HostDesktopType desktop_type) {
+  TaskManagerView::Show(true, desktop_type);
 }
 
 }  // namespace chrome
diff --git a/chrome/browser/ui/webui/task_manager/task_manager_handler.cc b/chrome/browser/ui/webui/task_manager/task_manager_handler.cc
index 37414e5..cd04624 100644
--- a/chrome/browser/ui/webui/task_manager/task_manager_handler.cc
+++ b/chrome/browser/ui/webui/task_manager/task_manager_handler.cc
@@ -13,6 +13,7 @@
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/task_manager/task_manager.h"
+#include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
@@ -201,7 +202,7 @@ void TaskManagerHandler::OpenAboutMemory(const ListValue* indexes) {
     DCHECK(false);
   }
 
-  task_manager_->OpenAboutMemory();
+  task_manager_->OpenAboutMemory(chrome::GetActiveDesktop());
 }
 
 void TaskManagerHandler::HandleSetUpdateColumn(const ListValue* args) {
diff --git a/chrome/test/base/test_browser_window.h b/chrome/test/base/test_browser_window.h
index a4a6ac4..db49774 100644
--- a/chrome/test/base/test_browser_window.h
+++ b/chrome/test/base/test_browser_window.h
@@ -94,8 +94,9 @@ class TestBrowserWindow : public BrowserWindow {
                                         Profile* profile) OVERRIDE {}
   virtual void ToggleBookmarkBar() OVERRIDE {}
   virtual void ShowUpdateChromeDialog() OVERRIDE {}
-  virtual void ShowTaskManager() OVERRIDE {}
-  virtual void ShowBackgroundPages() OVERRIDE {}
+  virtual void ShowTaskManager(chrome::HostDesktopType desktop_type) OVERRIDE {}
+  virtual void ShowBackgroundPages(
+      chrome::HostDesktopType desktop_type) OVERRIDE {}
   virtual void ShowBookmarkBubble(const GURL& url,
                                   bool already_bookmarked) OVERRIDE {}
   virtual void ShowChromeToMobileBubble() OVERRIDE {}