summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/task_manager/task_manager.cc3
-rw-r--r--chrome/browser/task_manager/task_manager.h2
-rw-r--r--chrome/browser/ui/cocoa/task_manager_mac.mm2
-rw-r--r--chrome/browser/ui/views/new_task_manager_view.cc15
-rw-r--r--chrome/browser/ui/views/new_task_manager_view.h8
-rw-r--r--chrome/browser/ui/views/task_manager_view.cc20
6 files changed, 15 insertions, 35 deletions
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
index 7d87aa7..3cfb995 100644
--- a/chrome/browser/task_manager/task_manager.cc
+++ b/chrome/browser/task_manager/task_manager.cc
@@ -1557,7 +1557,7 @@ TaskManager* TaskManager::GetInstance() {
return base::Singleton<TaskManager>::get();
}
-void TaskManager::OpenAboutMemory(chrome::HostDesktopType desktop_type) {
+void TaskManager::OpenAboutMemory() {
Profile* profile = ProfileManager::GetLastUsedProfileAllowedByPolicy();
if (profile->IsGuestSession() && !g_browser_process->local_state()->
GetBoolean(prefs::kBrowserGuestModeEnabled)) {
@@ -1570,7 +1570,6 @@ void TaskManager::OpenAboutMemory(chrome::HostDesktopType desktop_type) {
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);
}
diff --git a/chrome/browser/task_manager/task_manager.h b/chrome/browser/task_manager/task_manager.h
index a015843..5e4e1cc 100644
--- a/chrome/browser/task_manager/task_manager.h
+++ b/chrome/browser/task_manager/task_manager.h
@@ -84,7 +84,7 @@ class TaskManager {
TaskManagerModel* model() const { return model_.get(); }
- void OpenAboutMemory(chrome::HostDesktopType desktop_type);
+ void OpenAboutMemory();
private:
FRIEND_TEST_ALL_PREFIXES(TaskManagerTest, Basic);
diff --git a/chrome/browser/ui/cocoa/task_manager_mac.mm b/chrome/browser/ui/cocoa/task_manager_mac.mm
index 5ed4fbf..9c0726f 100644
--- a/chrome/browser/ui/cocoa/task_manager_mac.mm
+++ b/chrome/browser/ui/cocoa/task_manager_mac.mm
@@ -177,7 +177,7 @@ class SortHelper {
}
- (IBAction)statsLinkClicked:(id)sender {
- TaskManager::GetInstance()->OpenAboutMemory(chrome::HOST_DESKTOP_TYPE_NATIVE);
+ TaskManager::GetInstance()->OpenAboutMemory();
}
- (IBAction)killSelectedProcesses:(id)sender {
diff --git a/chrome/browser/ui/views/new_task_manager_view.cc b/chrome/browser/ui/views/new_task_manager_view.cc
index 8d4e19e..9b1af69 100644
--- a/chrome/browser/ui/views/new_task_manager_view.cc
+++ b/chrome/browser/ui/views/new_task_manager_view.cc
@@ -47,7 +47,7 @@ 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(
@@ -62,7 +62,6 @@ void OpenAboutMemory(chrome::HostDesktopType desktop_type) {
GURL(chrome::kChromeUIMemoryURL),
ui::PAGE_TRANSITION_LINK);
params.disposition = NEW_FOREGROUND_TAB;
- params.host_desktop_type = desktop_type;
chrome::Navigate(&params);
}
@@ -81,12 +80,7 @@ void NewTaskManagerView::Show(Browser* browser) {
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;
@@ -304,7 +298,7 @@ void NewTaskManagerView::OnKeyDown(ui::KeyboardCode keycode) {
void NewTaskManagerView::LinkClicked(views::Link* source, int event_flags) {
DCHECK_EQ(about_memory_link_, source);
- OpenAboutMemory(desktop_type_);
+ OpenAboutMemory();
}
void NewTaskManagerView::ShowContextMenuForView(
@@ -348,12 +342,11 @@ 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();
}
diff --git a/chrome/browser/ui/views/new_task_manager_view.h b/chrome/browser/ui/views/new_task_manager_view.h
index 4890bb3..5752ef9 100644
--- a/chrome/browser/ui/views/new_task_manager_view.h
+++ b/chrome/browser/ui/views/new_task_manager_view.h
@@ -8,7 +8,6 @@
#include <vector>
#include "base/macros.h"
-#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/task_manager/task_manager_table_model.h"
#include "ui/base/models/simple_menu_model.h"
#include "ui/base/models/table_model.h"
@@ -20,6 +19,8 @@
#include "ui/views/controls/table/table_view_observer.h"
#include "ui/views/window/dialog_delegate.h"
+class Browser;
+
namespace views {
class LabelButton;
class Link;
@@ -104,7 +105,7 @@ class NewTaskManagerView
private:
friend class NewTaskManagerViewTest;
- explicit NewTaskManagerView(chrome::HostDesktopType desktop_type);
+ NewTaskManagerView();
static NewTaskManagerView* GetInstanceForTests();
@@ -135,9 +136,6 @@ class NewTaskManagerView
// all possible columns, not necessarily visible
std::vector<ui::TableColumn> columns_;
- // The host desktop type this task manager belongs to.
- const chrome::HostDesktopType desktop_type_;
-
// True when the Task Manager window should be shown on top of other windows.
bool is_always_on_top_;
diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc
index 9dbc0fd..5d2cc61 100644
--- a/chrome/browser/ui/views/task_manager_view.cc
+++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -154,7 +154,7 @@ class TaskManagerView : public views::ButtonListener,
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.
@@ -234,9 +234,6 @@ class TaskManagerView : public views::ButtonListener,
// 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_;
@@ -252,16 +249,14 @@ class TaskManagerView : public views::ButtonListener,
// 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();
}
@@ -451,17 +446,12 @@ bool TaskManagerView::AcceleratorPressed(const ui::Accelerator& accelerator) {
// 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)
@@ -582,7 +572,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(desktop_type_);
+ task_manager_->OpenAboutMemory();
}
void TaskManagerView::ShowContextMenuForView(views::View* source,
generated by cgit v1.1 at 2025-05-30 10:36:16 +0000