| Index: chrome/browser/ui/views/task_manager_view.cc
|
| diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc
|
| index 5b6da9fb6bf01fdbd10bca79c2808ca0c3f03ac1..99061c6dc00bac4eaec0915dc5d6f2fc199f8888 100644
|
| --- a/chrome/browser/ui/views/task_manager_view.cc
|
| +++ b/chrome/browser/ui/views/task_manager_view.cc
|
| @@ -37,10 +37,6 @@
|
| static const int kDefaultWidth = 460;
|
| static const int kDefaultHeight = 270;
|
|
|
| -// The group IDs used to separate background pages from foreground tabs.
|
| -static const int kBackgroundGroupId = 0;
|
| -static const int kForegroundGroupId = 1;
|
| -
|
| namespace {
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| @@ -64,13 +60,9 @@ class TaskManagerTableModel : public views::GroupTableModel,
|
| int RowCount();
|
| std::wstring GetText(int row, int column);
|
| SkBitmap GetIcon(int row);
|
| - bool ShouldIndent(int row);
|
| void GetGroupRangeForItem(int item, views::GroupRange* range);
|
| void SetObserver(TableModelObserver* observer);
|
| virtual int CompareValues(int row1, int row2, int column_id);
|
| - virtual Groups GetGroups();
|
| - virtual bool HasGroups();
|
| - virtual int GetGroupID(int row);
|
|
|
| // TaskManagerModelObserver.
|
| virtual void OnModelChanged();
|
| @@ -158,9 +150,6 @@ SkBitmap TaskManagerTableModel::GetIcon(int row) {
|
| return model_->GetResourceIcon(row);
|
| }
|
|
|
| -bool TaskManagerTableModel::ShouldIndent(int row) {
|
| - return !model_->IsResourceFirstInGroup(row);
|
| -}
|
|
|
| void TaskManagerTableModel::GetGroupRangeForItem(int item,
|
| views::GroupRange* range) {
|
| @@ -177,41 +166,6 @@ int TaskManagerTableModel::CompareValues(int row1, int row2, int column_id) {
|
| return model_->CompareValues(row1, row2, column_id);
|
| }
|
|
|
| -bool TaskManagerTableModel::HasGroups() {
|
| - return true;
|
| -}
|
| -
|
| -int TaskManagerTableModel::GetGroupID(int row) {
|
| - // If there are any background resources in the group range, put the whole
|
| - // range in the background group.
|
| - std::pair<int, int> range_pair = model_->GetGroupRangeForResource(row);
|
| - for (int i = range_pair.first;
|
| - i < range_pair.first + range_pair.second;
|
| - ++i) {
|
| - if (model_->IsBackgroundResource(i))
|
| - return kBackgroundGroupId;
|
| - }
|
| - return kForegroundGroupId;
|
| -}
|
| -
|
| -TableModel::Groups TaskManagerTableModel::GetGroups() {
|
| - Groups groups;
|
| -
|
| - Group background_group;
|
| - background_group.title =
|
| - l10n_util::GetString(IDS_TASK_MANAGER_BACKGROUND_SEPARATOR);
|
| - background_group.id = kBackgroundGroupId;
|
| - groups.push_back(background_group);
|
| -
|
| - Group foreground_group;
|
| - foreground_group.title =
|
| - l10n_util::GetString(IDS_TASK_MANAGER_FOREGROUND_SEPARATOR);
|
| - foreground_group.id = kForegroundGroupId;
|
| - groups.push_back(foreground_group);
|
| -
|
| - return groups;
|
| -}
|
| -
|
| void TaskManagerTableModel::OnModelChanged() {
|
| if (observer_)
|
| observer_->OnModelChanged();
|
| @@ -358,7 +312,7 @@ void TaskManagerView::Init() {
|
| table_model_.reset(new TaskManagerTableModel(model_));
|
|
|
| // Page column has no header label.
|
| - columns_.push_back(TableColumn(IDS_TASK_MANAGER_PAGE_COLUMN, L"",
|
| + columns_.push_back(TableColumn(IDS_TASK_MANAGER_PAGE_COLUMN,
|
| TableColumn::LEFT, -1, 1));
|
| columns_.back().sortable = true;
|
| columns_.push_back(TableColumn(IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN,
|
| @@ -398,7 +352,7 @@ void TaskManagerView::Init() {
|
|
|
| tab_table_ = new views::GroupTableView(table_model_.get(), columns_,
|
| views::ICON_AND_TEXT, false, true,
|
| - true, false);
|
| + true, true);
|
|
|
| // Hide some columns by default
|
| tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_PROCESS_ID_COLUMN, false);
|
|
|