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

Side by Side Diff: chrome/browser/ui/views/task_manager_view.cc

Issue 7987001: Add profile name to task manager on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/metrics/stats_table.h" 9 #include "base/metrics/stats_table.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 87
88 int TaskManagerTableModel::RowCount() { 88 int TaskManagerTableModel::RowCount() {
89 return model_->ResourceCount(); 89 return model_->ResourceCount();
90 } 90 }
91 91
92 string16 TaskManagerTableModel::GetText(int row, int col_id) { 92 string16 TaskManagerTableModel::GetText(int row, int col_id) {
93 switch (col_id) { 93 switch (col_id) {
94 case IDS_TASK_MANAGER_PAGE_COLUMN: // Process 94 case IDS_TASK_MANAGER_PAGE_COLUMN: // Process
95 return model_->GetResourceTitle(row); 95 return model_->GetResourceTitle(row);
96 96
97 case IDS_TASK_MANAGER_PROFILE_NAME_COLUMN: // Profile Name
98 return model_->GetResourceProfileName(row);
99
97 case IDS_TASK_MANAGER_NET_COLUMN: // Net 100 case IDS_TASK_MANAGER_NET_COLUMN: // Net
98 return model_->GetResourceNetworkUsage(row); 101 return model_->GetResourceNetworkUsage(row);
99 102
100 case IDS_TASK_MANAGER_CPU_COLUMN: // CPU 103 case IDS_TASK_MANAGER_CPU_COLUMN: // CPU
101 if (!model_->IsResourceFirstInGroup(row)) 104 if (!model_->IsResourceFirstInGroup(row))
102 return string16(); 105 return string16();
103 return model_->GetResourceCPUUsage(row); 106 return model_->GetResourceCPUUsage(row);
104 107
105 case IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN: // Memory 108 case IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN: // Memory
106 if (!model_->IsResourceFirstInGroup(row)) 109 if (!model_->IsResourceFirstInGroup(row))
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 RemoveAllChildViews(true); 379 RemoveAllChildViews(true);
377 } 380 }
378 381
379 void TaskManagerView::Init() { 382 void TaskManagerView::Init() {
380 table_model_.reset(new TaskManagerTableModel(model_)); 383 table_model_.reset(new TaskManagerTableModel(model_));
381 384
382 // Page column has no header label. 385 // Page column has no header label.
383 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_PAGE_COLUMN, 386 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_PAGE_COLUMN,
384 ui::TableColumn::LEFT, -1, 1)); 387 ui::TableColumn::LEFT, -1, 1));
385 columns_.back().sortable = true; 388 columns_.back().sortable = true;
389 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_PROFILE_NAME_COLUMN,
390 ui::TableColumn::LEFT, -1, 0));
391 columns_.back().sortable = true;
386 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN, 392 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN,
387 ui::TableColumn::RIGHT, -1, 0)); 393 ui::TableColumn::RIGHT, -1, 0));
388 columns_.back().sortable = true; 394 columns_.back().sortable = true;
389 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_SHARED_MEM_COLUMN, 395 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_SHARED_MEM_COLUMN,
390 ui::TableColumn::RIGHT, -1, 0)); 396 ui::TableColumn::RIGHT, -1, 0));
391 columns_.back().sortable = true; 397 columns_.back().sortable = true;
392 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN, 398 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN,
393 ui::TableColumn::RIGHT, -1, 0)); 399 ui::TableColumn::RIGHT, -1, 0));
394 columns_.back().sortable = true; 400 columns_.back().sortable = true;
395 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_CPU_COLUMN, 401 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_CPU_COLUMN,
(...skipping 24 matching lines...) Expand all
420 columns_.back().sortable = true; 426 columns_.back().sortable = true;
421 columns_.push_back( 427 columns_.push_back(
422 ui::TableColumn(IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, 428 ui::TableColumn(IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN,
423 ui::TableColumn::RIGHT, -1, 0)); 429 ui::TableColumn::RIGHT, -1, 0));
424 columns_.back().sortable = true; 430 columns_.back().sortable = true;
425 431
426 tab_table_ = new BackgroundColorGroupTableView( 432 tab_table_ = new BackgroundColorGroupTableView(
427 table_model_.get(), columns_, highlight_background_resources_); 433 table_model_.get(), columns_, highlight_background_resources_);
428 434
429 // Hide some columns by default 435 // Hide some columns by default
436 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_PROFILE_NAME_COLUMN, false);
430 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_PROCESS_ID_COLUMN, false); 437 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_PROCESS_ID_COLUMN, false);
431 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_SHARED_MEM_COLUMN, false); 438 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_SHARED_MEM_COLUMN, false);
432 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN, false); 439 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN, false);
433 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN, 440 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN,
434 false); 441 false);
435 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN, 442 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN,
436 false); 443 false);
437 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN, 444 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN,
438 false); 445 false);
439 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, 446 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN,
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 // Declared in browser_dialogs.h so others don't need to depend on our header. 795 // Declared in browser_dialogs.h so others don't need to depend on our header.
789 void ShowTaskManager() { 796 void ShowTaskManager() {
790 TaskManagerView::Show(false); 797 TaskManagerView::Show(false);
791 } 798 }
792 799
793 void ShowBackgroundPages() { 800 void ShowBackgroundPages() {
794 TaskManagerView::Show(true); 801 TaskManagerView::Show(true);
795 } 802 }
796 803
797 } // namespace browser 804 } // namespace browser
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698