Remove HostDesktopType from task manager

chrome/browser/ui/views/task_manager_view.cc

 // Copyright (c) 2012 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 <stddef.h>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
@@ skipping 136 matching lines @@
 }
 
 // The Task Manager UI container.
 class TaskManagerView : public views::ButtonListener,
                         public views::DialogDelegateView,
                         public views::TableViewObserver,
                         public views::LinkListener,
                         public views::ContextMenuController,
                         public ui::SimpleMenuModel::Delegate {
  public:
-  explicit TaskManagerView(chrome::HostDesktopType desktop_type);
+  TaskManagerView();
   ~TaskManagerView() override;
 
   // Shows the Task Manager window, or re-activates an existing one.
   static void Show(Browser* browser);
 
   // Hides the Task Manager if it is showing.
   static void Hide();
 
   // views::View:
   void Layout() override;
@@ skipping 59 matching lines @@
   TaskManagerModel* model_;
 
   // all possible columns, not necessarily visible
   std::vector<ui::TableColumn> columns_;
 
   scoped_ptr<TaskManagerTableModel> table_model_;
 
   // True when the Task Manager window should be shown on top of other windows.
   bool is_always_on_top_;
 
-  // 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.
   base::string16 always_on_top_menu_text_;
 
   // An open Task manager window. There can only be one open at a time. This
   // is reset to NULL when the window is closed.
   static TaskManagerView* instance_;
 
   scoped_ptr<views::MenuRunner> menu_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskManagerView);
 };
 
 // static
 TaskManagerView* TaskManagerView::instance_ = NULL;
 
-
-TaskManagerView::TaskManagerView(chrome::HostDesktopType desktop_type)
+TaskManagerView::TaskManagerView()
     : kill_button_(NULL),
       about_memory_link_(NULL),
       tab_table_(NULL),
       tab_table_parent_(NULL),
       task_manager_(TaskManager::GetInstance()),
       model_(TaskManager::GetInstance()->model()),
-      is_always_on_top_(false),
-      desktop_type_(desktop_type) {
+      is_always_on_top_(false) {
   Init();
 }
 
 TaskManagerView::~TaskManagerView() {
   // Delete child views now, while our table model still exists.
   RemoveAllChildViews(true);
 }
 
 void TaskManagerView::Init() {
   table_model_.reset(new TaskManagerTableModel(model_));
@@ skipping 169 matching lines @@
 
 bool TaskManagerView::AcceleratorPressed(const ui::Accelerator& accelerator) {
   DCHECK_EQ(ui::VKEY_W, accelerator.key_code());
   DCHECK_EQ(ui::EF_CONTROL_DOWN, accelerator.modifiers());
   GetWidget()->Close();
   return true;
 }
 
 // static
 void TaskManagerView::Show(Browser* browser) {
-  // 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;
-
   if (instance_) {
     // If there's a Task manager window open already, just activate it.
     instance_->GetWidget()->Activate();
     return;
   }
-  instance_ = new TaskManagerView(desktop_type);
+  instance_ = new TaskManagerView();
   gfx::NativeWindow window =
       browser ? browser->window()->GetNativeWindow() : NULL;
 #if defined(USE_ASH)
   if (!window)
     window = ash::wm::GetActiveWindow();
 #endif
   DialogDelegate::CreateDialogWidget(instance_, window, NULL);
   instance_->InitAlwaysOnTopState();
   instance_->model_->StartUpdating();
 #if defined(OS_WIN)
@@ skipping 100 matching lines @@
   ActivateFocusedTab();
 }
 
 void TaskManagerView::OnKeyDown(ui::KeyboardCode keycode) {
   if (keycode == ui::VKEY_RETURN)
     ActivateFocusedTab();
 }
 
 void TaskManagerView::LinkClicked(views::Link* source, int event_flags) {
   DCHECK_EQ(about_memory_link_, source);
-  task_manager_->OpenAboutMemory(desktop_type_);
+  task_manager_->OpenAboutMemory();
 }
 
 void TaskManagerView::ShowContextMenuForView(views::View* source,
                                              const gfx::Point& point,
                                              ui::MenuSourceType source_type) {
   ui::SimpleMenuModel menu_model(this);
   for (std::vector<ui::TableColumn>::iterator i(columns_.begin());
        i != columns_.end(); ++i) {
     menu_model.AddCheckItem(i->id, l10n_util::GetStringUTF16(i->id));
   }
@@ skipping 65 matching lines @@
 void HideTaskManager() {
   if (switches::NewTaskManagerEnabled()) {
     task_management::NewTaskManagerView::Hide();
     return;
   }
 
   TaskManagerView::Hide();
 }
 
 }  // namespace chrome