OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/task_manager/task_manager.h" | 5 #include "chrome/browser/task_manager/task_manager.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
213 views::TableView* tab_table_; | 213 views::TableView* tab_table_; |
214 views::View* tab_table_parent_; | 214 views::View* tab_table_parent_; |
215 | 215 |
216 TaskManager* task_manager_; | 216 TaskManager* task_manager_; |
217 | 217 |
218 TaskManagerModel* model_; | 218 TaskManagerModel* model_; |
219 | 219 |
220 // all possible columns, not necessarily visible | 220 // all possible columns, not necessarily visible |
221 std::vector<ui::TableColumn> columns_; | 221 std::vector<ui::TableColumn> columns_; |
222 | 222 |
223 scoped_ptr<TaskManagerTableModel> table_model_; | 223 std::unique_ptr<TaskManagerTableModel> table_model_; |
224 | 224 |
225 // True when the Task Manager window should be shown on top of other windows. | 225 // True when the Task Manager window should be shown on top of other windows. |
226 bool is_always_on_top_; | 226 bool is_always_on_top_; |
227 | 227 |
228 // We need to own the text of the menu, the Windows API does not copy it. | 228 // We need to own the text of the menu, the Windows API does not copy it. |
229 base::string16 always_on_top_menu_text_; | 229 base::string16 always_on_top_menu_text_; |
230 | 230 |
231 // An open Task manager window. There can only be one open at a time. This | 231 // An open Task manager window. There can only be one open at a time. This |
232 // is reset to NULL when the window is closed. | 232 // is reset to NULL when the window is closed. |
233 static TaskManagerView* instance_; | 233 static TaskManagerView* instance_; |
234 | 234 |
235 scoped_ptr<views::MenuRunner> menu_runner_; | 235 std::unique_ptr<views::MenuRunner> menu_runner_; |
236 | 236 |
237 DISALLOW_COPY_AND_ASSIGN(TaskManagerView); | 237 DISALLOW_COPY_AND_ASSIGN(TaskManagerView); |
238 }; | 238 }; |
239 | 239 |
240 // static | 240 // static |
241 TaskManagerView* TaskManagerView::instance_ = NULL; | 241 TaskManagerView* TaskManagerView::instance_ = NULL; |
242 | 242 |
243 TaskManagerView::TaskManagerView() | 243 TaskManagerView::TaskManagerView() |
244 : kill_button_(NULL), | 244 : kill_button_(NULL), |
245 tab_table_(NULL), | 245 tab_table_(NULL), |
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
624 void HideTaskManager() { | 624 void HideTaskManager() { |
625 if (switches::NewTaskManagerEnabled()) { | 625 if (switches::NewTaskManagerEnabled()) { |
626 task_management::NewTaskManagerView::Hide(); | 626 task_management::NewTaskManagerView::Hide(); |
627 return; | 627 return; |
628 } | 628 } |
629 | 629 |
630 TaskManagerView::Hide(); | 630 TaskManagerView::Hide(); |
631 } | 631 } |
632 | 632 |
633 } // namespace chrome | 633 } // namespace chrome |
OLD | NEW |