Remove HostDesktopType from task manager

chrome/browser/ui/views/new_task_manager_view.cc

 // Copyright 2015 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/ui/views/new_task_manager_view.h"
 
 #include <stddef.h>
 
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 29 matching lines @@
 #include "ui/views/win/hwnd_util.h"
 #endif  // defined(OS_WIN)
 
 namespace task_management {
 
 namespace {
 
 NewTaskManagerView* g_task_manager_view = nullptr;
 
 // Opens the "about:memory" for the "stats for nerds" link.
-void OpenAboutMemory(chrome::HostDesktopType desktop_type) {
+void OpenAboutMemory() {
   Profile* profile = ProfileManager::GetLastUsedProfileAllowedByPolicy();
   if (profile->IsGuestSession() &&
       !g_browser_process->local_state()->GetBoolean(
           prefs::kBrowserGuestModeEnabled)) {
     UserManager::Show(base::FilePath(),
                       profiles::USER_MANAGER_NO_TUTORIAL,
                       profiles::USER_MANAGER_SELECT_PROFILE_CHROME_MEMORY);
     return;
   }
 
   chrome::NavigateParams params(profile,
                                 GURL(chrome::kChromeUIMemoryURL),
                                 ui::PAGE_TRANSITION_LINK);
   params.disposition = NEW_FOREGROUND_TAB;
-  params.host_desktop_type = desktop_type;
   chrome::Navigate(&params);
 }
 
 }  // namespace
 
 NewTaskManagerView::~NewTaskManagerView() {
   // Delete child views now, while our table model still exists.
   RemoveAllChildViews(true);
 }
 
 // static
 void NewTaskManagerView::Show(Browser* browser) {
   if (g_task_manager_view) {
     // If there's a Task manager window open already, just activate it.
     g_task_manager_view->GetWidget()->Activate();
     return;
   }
 
-  // In ash we can come here through the ChromeShellDelegate. If there is no
-  // browser window at that time of the call, browser could be passed as NULL.
-  const chrome::HostDesktopType desktop_type =
-      browser ? browser->host_desktop_type() : chrome::HOST_DESKTOP_TYPE_ASH;
-
-  g_task_manager_view = new NewTaskManagerView(desktop_type);
+  g_task_manager_view = new NewTaskManagerView();
 
   gfx::NativeWindow window = browser ? browser->window()->GetNativeWindow()
                                      : nullptr;
 #if defined(USE_ASH)
   if (!window)
     window = ash::wm::GetActiveWindow();
 #endif
 
   DialogDelegate::CreateDialogWidget(g_task_manager_view,
                                      window,
@@ skipping 197 matching lines @@
   ActivateFocusedTab();
 }
 
 void NewTaskManagerView::OnKeyDown(ui::KeyboardCode keycode) {
   if (keycode == ui::VKEY_RETURN)
     ActivateFocusedTab();
 }
 
 void NewTaskManagerView::LinkClicked(views::Link* source, int event_flags) {
   DCHECK_EQ(about_memory_link_, source);
-  OpenAboutMemory(desktop_type_);
+  OpenAboutMemory();
 }
 
 void NewTaskManagerView::ShowContextMenuForView(
     views::View* source,
     const gfx::Point& point,
     ui::MenuSourceType source_type) {
   ui::SimpleMenuModel menu_model(this);
 
   for (const auto& table_column : columns_) {
     menu_model.AddCheckItem(table_column.id,
@@ skipping 23 matching lines @@
 bool NewTaskManagerView::GetAcceleratorForCommandId(
     int command_id,
     ui::Accelerator* accelerator) {
   return false;
 }
 
 void NewTaskManagerView::ExecuteCommand(int id, int event_flags) {
   table_model_->ToggleColumnVisibility(id);
 }
 
-NewTaskManagerView::NewTaskManagerView(chrome::HostDesktopType desktop_type)
+NewTaskManagerView::NewTaskManagerView()
     : kill_button_(nullptr),
       about_memory_link_(nullptr),
       tab_table_(nullptr),
       tab_table_parent_(nullptr),
-      desktop_type_(desktop_type),
       is_always_on_top_(false) {
   Init();
 }
 
 // static
 NewTaskManagerView* NewTaskManagerView::GetInstanceForTests() {
   return g_task_manager_view;
 }
 
 void NewTaskManagerView::Init() {
@@ skipping 53 matching lines @@
   if (!g_browser_process->local_state())
     return;
 
   const base::DictionaryValue* dictionary =
     g_browser_process->local_state()->GetDictionary(GetWindowName());
   if (dictionary)
     dictionary->GetBoolean("always_on_top", &is_always_on_top_);
 }
 
 }  // namespace task_management