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

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

Issue 10854076: Add GPU memory tab to the task manager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Incorporate review feedback Created 8 years, 4 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
OLDNEW
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/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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 return model_->GetResourceWebCoreScriptsCacheSize(row); 144 return model_->GetResourceWebCoreScriptsCacheSize(row);
145 145
146 case IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN: 146 case IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN:
147 if (!model_->IsResourceFirstInGroup(row)) 147 if (!model_->IsResourceFirstInGroup(row))
148 return string16(); 148 return string16();
149 return model_->GetResourceWebCoreCSSCacheSize(row); 149 return model_->GetResourceWebCoreCSSCacheSize(row);
150 150
151 case IDS_TASK_MANAGER_FPS_COLUMN: 151 case IDS_TASK_MANAGER_FPS_COLUMN:
152 return model_->GetResourceFPS(row); 152 return model_->GetResourceFPS(row);
153 153
154 case IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN:
155 return model_->GetResourceVideoMemory(row);
156
154 case IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN: 157 case IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN:
155 if (!model_->IsResourceFirstInGroup(row)) 158 if (!model_->IsResourceFirstInGroup(row))
156 return string16(); 159 return string16();
157 return model_->GetResourceSqliteMemoryUsed(row); 160 return model_->GetResourceSqliteMemoryUsed(row);
158 161
159 case IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN: 162 case IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN:
160 if (!model_->IsResourceFirstInGroup(row)) 163 if (!model_->IsResourceFirstInGroup(row))
161 return string16(); 164 return string16();
162 return model_->GetResourceV8MemoryAllocatedSize(row); 165 return model_->GetResourceV8MemoryAllocatedSize(row);
163 166
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 columns_.back().sortable = true; 422 columns_.back().sortable = true;
420 columns_.push_back(ui::TableColumn( 423 columns_.push_back(ui::TableColumn(
421 IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN, 424 IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN,
422 ui::TableColumn::RIGHT, -1, 0)); 425 ui::TableColumn::RIGHT, -1, 0));
423 columns_.back().sortable = true; 426 columns_.back().sortable = true;
424 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN, 427 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN,
425 ui::TableColumn::RIGHT, -1, 0)); 428 ui::TableColumn::RIGHT, -1, 0));
426 columns_.back().sortable = true; 429 columns_.back().sortable = true;
427 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_FPS_COLUMN, 430 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_FPS_COLUMN,
428 ui::TableColumn::RIGHT, -1, 0)); 431 ui::TableColumn::RIGHT, -1, 0));
432 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN,
433 ui::TableColumn::RIGHT, -1, 0));
429 columns_.back().sortable = true; 434 columns_.back().sortable = true;
430 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, 435 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN,
431 ui::TableColumn::RIGHT, -1, 0)); 436 ui::TableColumn::RIGHT, -1, 0));
432 columns_.back().sortable = true; 437 columns_.back().sortable = true;
433 columns_.push_back( 438 columns_.push_back(
434 ui::TableColumn(IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, 439 ui::TableColumn(IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN,
435 ui::TableColumn::RIGHT, -1, 0)); 440 ui::TableColumn::RIGHT, -1, 0));
436 columns_.back().sortable = true; 441 columns_.back().sortable = true;
437 442
438 tab_table_ = new BackgroundColorGroupTableView( 443 tab_table_ = new BackgroundColorGroupTableView(
439 table_model_.get(), columns_, highlight_background_resources_); 444 table_model_.get(), columns_, highlight_background_resources_);
440 445
441 // Hide some columns by default 446 // Hide some columns by default
442 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_PROFILE_NAME_COLUMN, false); 447 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_PROFILE_NAME_COLUMN, false);
443 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_PROCESS_ID_COLUMN, false); 448 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_PROCESS_ID_COLUMN, false);
444 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_SHARED_MEM_COLUMN, false); 449 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_SHARED_MEM_COLUMN, false);
445 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN, false); 450 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN, false);
446 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN, 451 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN,
447 false); 452 false);
448 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN, 453 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN,
449 false); 454 false);
450 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN, 455 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN,
451 false); 456 false);
457 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN,
458 false);
452 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, 459 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN,
453 false); 460 false);
454 tab_table_->SetColumnVisibility( 461 tab_table_->SetColumnVisibility(
455 IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, false); 462 IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, false);
456 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN, 463 tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN,
457 false); 464 false);
458 465
459 UpdateStatsCounters(); 466 UpdateStatsCounters();
460 tab_table_->SetObserver(this); 467 tab_table_->SetObserver(this);
461 tab_table_->set_context_menu_controller(this); 468 tab_table_->set_context_menu_controller(this);
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
800 // Declared in browser_dialogs.h so others don't need to depend on our header. 807 // Declared in browser_dialogs.h so others don't need to depend on our header.
801 void ShowTaskManager() { 808 void ShowTaskManager() {
802 TaskManagerView::Show(false); 809 TaskManagerView::Show(false);
803 } 810 }
804 811
805 void ShowBackgroundPages() { 812 void ShowBackgroundPages() {
806 TaskManagerView::Show(true); 813 TaskManagerView::Show(true);
807 } 814 }
808 815
809 } // namespace chrome 816 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698