Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7223)

Unified Diff: chrome/browser/ui/views/task_manager_view.cc

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/task_manager_view.cc
diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc
index 3864f10fde04927c87564219ad253bcb17f25589..c05b7c483f2bf358d1b8ac359ab4857a5fa61ff5 100644
--- a/chrome/browser/ui/views/task_manager_view.cc
+++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -150,7 +150,7 @@ class TaskManagerView : public views::ButtonListener,
public views::ContextMenuController,
public ui::SimpleMenuModel::Delegate {
public:
- explicit TaskManagerView(chrome::HostDesktopType desktop_type);
+ explicit TaskManagerView(ui::HostDesktopType desktop_type);
~TaskManagerView() override;
// Shows the Task Manager window, or re-activates an existing one.
@@ -231,7 +231,7 @@ class TaskManagerView : public views::ButtonListener,
bool is_always_on_top_;
// The host desktop type this task manager belongs to.
- const chrome::HostDesktopType desktop_type_;
+ const ui::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_;
@@ -248,8 +248,7 @@ class TaskManagerView : public views::ButtonListener,
// static
TaskManagerView* TaskManagerView::instance_ = NULL;
-
-TaskManagerView::TaskManagerView(chrome::HostDesktopType desktop_type)
+TaskManagerView::TaskManagerView(ui::HostDesktopType desktop_type)
: kill_button_(NULL),
about_memory_link_(NULL),
tab_table_(NULL),
@@ -449,8 +448,8 @@ bool TaskManagerView::AcceleratorPressed(const ui::Accelerator& accelerator) {
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;
+ const ui::HostDesktopType desktop_type =
+ browser ? browser->host_desktop_type() : ui::HOST_DESKTOP_TYPE_ASH;
if (instance_) {
// If there's a Task manager window open already, just activate it.

Powered by Google App Engine
This is Rietveld 408576698