diff options
| -rw-r--r-- | chrome/browser/ui/views/task_manager_view.cc | 7 | ||||
| -rw-r--r-- | ui/base/models/table_model.cc | 38 | ||||
| -rw-r--r-- | ui/base/models/table_model.h | 9 | ||||
| -rw-r--r-- | ui/views/examples/table_example.cc | 24 |
4 files changed, 22 insertions, 56 deletions
diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc index 3fdd0e3..ebd2daf2 100644 --- a/chrome/browser/ui/views/task_manager_view.cc +++ b/chrome/browser/ui/views/task_manager_view.cc @@ -494,10 +494,13 @@ void TaskManagerView::UpdateStatsCounters() { // TODO(erikkay): Use l10n to get display names for stats. Right // now we're just displaying the internal counter name. Perhaps // stat names not in the string table would be filtered out. + ui::TableColumn col; + col.id = i; + col.title = ASCIIToUTF16(row); + col.alignment = ui::TableColumn::RIGHT; // TODO(erikkay): Width is hard-coded right now, so many column // names are clipped. - ui::TableColumn col(i, ASCIIToUTF16(row), ui::TableColumn::RIGHT, 90, - 0); + col.width = 90; col.sortable = true; columns_.push_back(col); tab_table_->AddColumn(col); diff --git a/ui/base/models/table_model.cc b/ui/base/models/table_model.cc index 35c6c8e..f59e7dd 100644 --- a/ui/base/models/table_model.cc +++ b/ui/base/models/table_model.cc @@ -23,50 +23,14 @@ TableColumn::TableColumn() sortable(false) { } -TableColumn::TableColumn(int id, const string16& title, - Alignment alignment, - int width) - : id(id), - title(title), - alignment(alignment), - width(width), - percent(0), - min_visible_width(0), - sortable(false) { -} - -TableColumn::TableColumn(int id, const string16& title, - Alignment alignment, int width, float percent) - : id(id), - title(title), - alignment(alignment), - width(width), - percent(percent), - min_visible_width(0), - sortable(false) { -} - -// It's common (but not required) to use the title's IDS_* tag as the column -// id. In this case, the provided conveniences look up the title string on -// bahalf of the caller. -TableColumn::TableColumn(int id, Alignment alignment, int width) - : id(id), - alignment(alignment), - width(width), - percent(0), - min_visible_width(0), - sortable(false) { - title = l10n_util::GetStringUTF16(id); -} - TableColumn::TableColumn(int id, Alignment alignment, int width, float percent) : id(id), + title(l10n_util::GetStringUTF16(id)), alignment(alignment), width(width), percent(percent), min_visible_width(0), sortable(false) { - title = l10n_util::GetStringUTF16(id); } // TableModel ----------------------------------------------------------------- diff --git a/ui/base/models/table_model.h b/ui/base/models/table_model.h index 04b2f0d..98286ed 100644 --- a/ui/base/models/table_model.h +++ b/ui/base/models/table_model.h @@ -97,15 +97,6 @@ struct UI_EXPORT TableColumn { }; TableColumn(); - TableColumn(int id, const string16& title, - Alignment alignment, int width); - TableColumn(int id, const string16& title, - Alignment alignment, int width, float percent); - - // It's common (but not required) to use the title's IDS_* tag as the column - // id. In this case, the provided conveniences look up the title string on - // bahalf of the caller. - TableColumn(int id, Alignment alignment, int width); TableColumn(int id, Alignment alignment, int width, float percent); // A unique identifier for the column. diff --git a/ui/views/examples/table_example.cc b/ui/views/examples/table_example.cc index c5ca6d6..b61a7a8 100644 --- a/ui/views/examples/table_example.cc +++ b/ui/views/examples/table_example.cc @@ -17,6 +17,18 @@ namespace views { namespace examples { +namespace { + +ui::TableColumn TestTableColumn(int id, const std::string& title) { + ui::TableColumn column; + column.id = id; + column.title = ASCIIToUTF16(title.c_str()); + column.width = 100; + return column; +} + +} // namespace + TableExample::TableExample() : ExampleBase("Table") , table_(NULL) { } @@ -50,15 +62,11 @@ void TableExample::CreateExampleView(View* container) { container->SetLayoutManager(layout); std::vector<ui::TableColumn> columns; - columns.push_back(ui::TableColumn(0, ASCIIToUTF16("Fruit"), - ui::TableColumn::LEFT, 100)); + columns.push_back(TestTableColumn(0, "Fruit")); #if defined(OS_WIN) && !defined(USE_AURA) - columns.push_back(ui::TableColumn(1, ASCIIToUTF16("Color"), - ui::TableColumn::LEFT, 100)); - columns.push_back(ui::TableColumn(2, ASCIIToUTF16("Origin"), - ui::TableColumn::LEFT, 100)); - columns.push_back(ui::TableColumn(3, ASCIIToUTF16("Price"), - ui::TableColumn::LEFT, 100)); + columns.push_back(TestTableColumn(1, "Color")); + columns.push_back(TestTableColumn(2, "Origin")); + columns.push_back(TestTableColumn(3, "Price")); #endif table_ = new TableView(this, columns, ICON_AND_TEXT, true, true, true); table_->SetObserver(this); |