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

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

Issue 102073008: Allow multiple NaCl modules to be debugged. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac Created 7 years 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/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 columns_.back().sortable = true; 324 columns_.back().sortable = true;
325 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_FPS_COLUMN, 325 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_FPS_COLUMN,
326 ui::TableColumn::RIGHT, -1, 0)); 326 ui::TableColumn::RIGHT, -1, 0));
327 columns_.back().sortable = true; 327 columns_.back().sortable = true;
328 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN, 328 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN,
329 ui::TableColumn::RIGHT, -1, 0)); 329 ui::TableColumn::RIGHT, -1, 0));
330 columns_.back().sortable = true; 330 columns_.back().sortable = true;
331 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, 331 columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN,
332 ui::TableColumn::RIGHT, -1, 0)); 332 ui::TableColumn::RIGHT, -1, 0));
333 columns_.back().sortable = true; 333 columns_.back().sortable = true;
334 columns_.push_back(ui::TableColumn(
335 IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN,
336 ui::TableColumn::RIGHT, -1, 0));
337 columns_.back().sortable = true;
334 columns_.push_back( 338 columns_.push_back(
335 ui::TableColumn(IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, 339 ui::TableColumn(IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN,
336 ui::TableColumn::RIGHT, -1, 0)); 340 ui::TableColumn::RIGHT, -1, 0));
337 columns_.back().sortable = true; 341 columns_.back().sortable = true;
338 342
339 tab_table_ = new views::TableView( 343 tab_table_ = new views::TableView(
340 table_model_.get(), columns_, views::ICON_AND_TEXT, false); 344 table_model_.get(), columns_, views::ICON_AND_TEXT, false);
341 tab_table_->SetGrouper(table_model_.get()); 345 tab_table_->SetGrouper(table_model_.get());
342 346
343 // Hide some columns by default 347 // Hide some columns by default
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 } // namespace 724 } // namespace
721 725
722 namespace chrome { 726 namespace chrome {
723 727
724 // Declared in browser_dialogs.h so others don't need to depend on our header. 728 // Declared in browser_dialogs.h so others don't need to depend on our header.
725 void ShowTaskManager(Browser* browser) { 729 void ShowTaskManager(Browser* browser) {
726 TaskManagerView::Show(browser); 730 TaskManagerView::Show(browser);
727 } 731 }
728 732
729 } // namespace chrome 733 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698