| 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 "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "base/metrics/stats_table.h" | 8 #include "base/metrics/stats_table.h" |
| 9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "base/prefs/scoped_user_pref_update.h" | 10 #include "base/prefs/scoped_user_pref_update.h" |
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 311 IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN, | 311 IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN, |
| 312 ui::TableColumn::RIGHT, -1, 0)); | 312 ui::TableColumn::RIGHT, -1, 0)); |
| 313 columns_.back().sortable = true; | 313 columns_.back().sortable = true; |
| 314 columns_.push_back(ui::TableColumn( | 314 columns_.push_back(ui::TableColumn( |
| 315 IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN, | 315 IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN, |
| 316 ui::TableColumn::RIGHT, -1, 0)); | 316 ui::TableColumn::RIGHT, -1, 0)); |
| 317 columns_.back().sortable = true; | 317 columns_.back().sortable = true; |
| 318 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN, | 318 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN, |
| 319 ui::TableColumn::RIGHT, -1, 0)); | 319 ui::TableColumn::RIGHT, -1, 0)); |
| 320 columns_.back().sortable = true; | 320 columns_.back().sortable = true; |
| 321 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_FPS_COLUMN, | |
| 322 ui::TableColumn::RIGHT, -1, 0)); | |
| 323 columns_.back().sortable = true; | |
| 324 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN, | 321 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN, |
| 325 ui::TableColumn::RIGHT, -1, 0)); | 322 ui::TableColumn::RIGHT, -1, 0)); |
| 326 columns_.back().sortable = true; | 323 columns_.back().sortable = true; |
| 327 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, | 324 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, |
| 328 ui::TableColumn::RIGHT, -1, 0)); | 325 ui::TableColumn::RIGHT, -1, 0)); |
| 329 columns_.back().sortable = true; | 326 columns_.back().sortable = true; |
| 330 columns_.push_back(ui::TableColumn( | 327 columns_.push_back(ui::TableColumn( |
| 331 IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN, | 328 IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN, |
| 332 ui::TableColumn::RIGHT, -1, 0)); | 329 ui::TableColumn::RIGHT, -1, 0)); |
| 333 columns_.back().sortable = true; | 330 columns_.back().sortable = true; |
| (...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 648 } // namespace | 645 } // namespace |
| 649 | 646 |
| 650 namespace chrome { | 647 namespace chrome { |
| 651 | 648 |
| 652 // Declared in browser_dialogs.h so others don't need to depend on our header. | 649 // Declared in browser_dialogs.h so others don't need to depend on our header. |
| 653 void ShowTaskManager(Browser* browser) { | 650 void ShowTaskManager(Browser* browser) { |
| 654 TaskManagerView::Show(browser); | 651 TaskManagerView::Show(browser); |
| 655 } | 652 } |
| 656 | 653 |
| 657 } // namespace chrome | 654 } // namespace chrome |
| OLD | NEW |