| Index: chrome/browser/ui/views/new_task_manager_view.cc
|
| diff --git a/chrome/browser/ui/views/new_task_manager_view.cc b/chrome/browser/ui/views/new_task_manager_view.cc
|
| index 8afec24e23c09e84918d034f48d343c5880b56f0..c0f15e90d6325322d22b6bb627721f39bb55c5be 100644
|
| --- a/chrome/browser/ui/views/new_task_manager_view.cc
|
| +++ b/chrome/browser/ui/views/new_task_manager_view.cc
|
| @@ -88,7 +88,7 @@ bool IsSharedByGroup(int column_id) {
|
| }
|
|
|
| // Opens the "about:memory" for the "stats for nerds" link.
|
| -void OpenAboutMemory(chrome::HostDesktopType desktop_type) {
|
| +void OpenAboutMemory(ui::HostDesktopType desktop_type) {
|
| Profile* profile = ProfileManager::GetLastUsedProfileAllowedByPolicy();
|
| if (profile->IsGuestSession() &&
|
| !g_browser_process->local_state()->GetBoolean(
|
| @@ -840,8 +840,8 @@ void NewTaskManagerView::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;
|
|
|
| g_task_manager_view = new NewTaskManagerView(desktop_type);
|
|
|
| @@ -1076,11 +1076,9 @@ void NewTaskManagerView::ExecuteCommand(int id, int event_flags) {
|
| ToggleColumnVisibility(id);
|
| }
|
|
|
| -NewTaskManagerView::NewTaskManagerView(chrome::HostDesktopType desktop_type)
|
| - : table_model_(
|
| - new NewTaskManagerView::TableModel(REFRESH_TYPE_CPU |
|
| - REFRESH_TYPE_MEMORY |
|
| - REFRESH_TYPE_NETWORK_USAGE)),
|
| +NewTaskManagerView::NewTaskManagerView(ui::HostDesktopType desktop_type)
|
| + : table_model_(new NewTaskManagerView::TableModel(
|
| + REFRESH_TYPE_CPU | REFRESH_TYPE_MEMORY | REFRESH_TYPE_NETWORK_USAGE)),
|
| kill_button_(nullptr),
|
| about_memory_link_(nullptr),
|
| tab_table_(nullptr),
|
|
|