| Index: views/examples/table2_example.cc
|
| diff --git a/views/examples/table2_example.cc b/views/examples/table2_example.cc
|
| index 0ae970e9c44fe930d0b2b2791032619eab4cdc22..70d6374b90a030529de3d3b051c5ad5bab5ebc40 100644
|
| --- a/views/examples/table2_example.cc
|
| +++ b/views/examples/table2_example.cc
|
| @@ -40,15 +40,15 @@ void Table2Example::CreateExampleView(views::View* container) {
|
| views::GridLayout* layout = new views::GridLayout(container);
|
| container->SetLayoutManager(layout);
|
|
|
| - std::vector<TableColumn> columns;
|
| + std::vector<ui::TableColumn> columns;
|
| columns.push_back(
|
| - TableColumn(0, ASCIIToUTF16("Fruit"), TableColumn::LEFT, 100));
|
| + ui::TableColumn(0, ASCIIToUTF16("Fruit"), ui::TableColumn::LEFT, 100));
|
| columns.push_back(
|
| - TableColumn(1, ASCIIToUTF16("Color"), TableColumn::LEFT, 100));
|
| + ui::TableColumn(1, ASCIIToUTF16("Color"), ui::TableColumn::LEFT, 100));
|
| columns.push_back(
|
| - TableColumn(2, ASCIIToUTF16("Origin"), TableColumn::LEFT, 100));
|
| + ui::TableColumn(2, ASCIIToUTF16("Origin"), ui::TableColumn::LEFT, 100));
|
| columns.push_back(
|
| - TableColumn(3, ASCIIToUTF16("Price"), TableColumn::LEFT, 100));
|
| + ui::TableColumn(3, ASCIIToUTF16("Price"), ui::TableColumn::LEFT, 100));
|
| const int options = (views::TableView2::SINGLE_SELECTION |
|
| views::TableView2::RESIZABLE_COLUMNS |
|
| views::TableView2::AUTOSIZE_COLUMNS |
|
| @@ -109,7 +109,7 @@ SkBitmap Table2Example::GetIcon(int row) {
|
| return row % 2 ? icon1_ : icon2_;
|
| }
|
|
|
| -void Table2Example::SetObserver(TableModelObserver* observer) {
|
| +void Table2Example::SetObserver(ui::TableModelObserver* observer) {
|
| }
|
|
|
| void Table2Example::ButtonPressed(views::Button* sender,
|
|
|