Leftover wstring removal from r70290

views/examples/table2_example.h

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef VIEWS_EXAMPLES_TABLE2_EXAMPLE_H_
 #define VIEWS_EXAMPLES_TABLE2_EXAMPLE_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 33 matching lines @@
     column3_visible_checkbox_->SetChecked(true);
     column3_visible_checkbox_->set_listener(this);
     column4_visible_checkbox_ = new views::Checkbox(L"Price column visible");
     column4_visible_checkbox_->SetChecked(true);
     column4_visible_checkbox_->set_listener(this);
 
     views::GridLayout* layout = new views::GridLayout(container);
     container->SetLayoutManager(layout);
 
     std::vector<TableColumn> columns;
-    columns.push_back(TableColumn(0, L"Fruit", TableColumn::LEFT, 100));
-    columns.push_back(TableColumn(1, L"Color", TableColumn::LEFT, 100));
-    columns.push_back(TableColumn(2, L"Origin", TableColumn::LEFT, 100));
-    columns.push_back(TableColumn(3, L"Price", TableColumn::LEFT, 100));
+    columns.push_back(TableColumn(0, ASCIIToUTF16("Fruit"), TableColumn::LEFT,
+        100));
+    columns.push_back(TableColumn(1, ASCIIToUTF16("Color"), TableColumn::LEFT,
+        100));
+    columns.push_back(TableColumn(2, ASCIIToUTF16("Origin"), TableColumn::LEFT,
+        100));
+    columns.push_back(TableColumn(3, ASCIIToUTF16("Price"), TableColumn::LEFT,
+        100));
     const int options = (views::TableView2::SINGLE_SELECTION |
                          views::TableView2::RESIZABLE_COLUMNS |
                          views::TableView2::AUTOSIZE_COLUMNS |
                          views::TableView2::HORIZONTAL_LINES |
                          views::TableView2::VERTICAL_LINES);
     table_ = new views::TableView2(this, columns, views::ICON_AND_TEXT,
                                    options);
     table_->SetObserver(this);
     icon1.setConfig(SkBitmap::kARGB_8888_Config, 16, 16);
     icon1.allocPixels();
@@ skipping 23 matching lines @@
 
     layout->StartRow(0 /* no expand */, 1);
 
     layout->AddView(column1_visible_checkbox_);
     layout->AddView(column2_visible_checkbox_);
     layout->AddView(column3_visible_checkbox_);
     layout->AddView(column4_visible_checkbox_);
   }
 
   // TableModel implementation:
   virtual int RowCount() {

[viettrungluu, 2010/12/30 05:21:16]

Arguably, you should include base/compiler_specific.h and mark these with
OVERRIDE. Unfortunately, that only does anything on Windows right now. :(

[sadrul, 2010/12/30 05:33:49]

I am not really familiar with OVERRIDE. So I will skip this one for the moment.
:)

     return 10;
   }
 
-  virtual std::wstring GetText(int row, int column_id) {
-    std::wstring cells[5][5] = {
-      { L"Orange", L"Orange", L"South america", L"$5" },
-      { L"Apple", L"Green", L"Canada", L"$3" },
-      { L"Blue berries", L"Blue", L"Mexico", L"$10.3" },
-      { L"Strawberries", L"Red", L"California", L"$7" },
-      { L"Cantaloupe", L"Orange", L"South america", L"$5" },
+  virtual string16 GetText(int row, int column_id) {
+    std::string cells[5][5] = {

[viettrungluu, 2010/12/30 05:21:16]

Comment: This may as well be made a const char* const cells[5][5], no?

(Making that conversion, it may or may not do the right thing for the last
element of each row. In any case, I find it somewhat disturbing that the rows
only have four entries each....)

[sadrul, 2010/12/30 05:33:49]

Making it const char* const sounds like a good idea to me. So I have made that
change. I also changed the column-count to 4. It works OK.

+      { "Orange", "Orange", "South america", "$5" },
+      { "Apple", "Green", "Canada", "$3" },
+      { "Blue berries", "Blue", "Mexico", "$10.3" },
+      { "Strawberries", "Red", "California", "$7" },
+      { "Cantaloupe", "Orange", "South america", "$5" },

[viettrungluu, 2010/12/30 05:21:16]

(And, strictly speaking, C++ doesn't allow the trailing comma, IIRC....)

[sadrul, 2010/12/30 05:33:49]

Fixed.

     };
-    return cells[row % 5][column_id];
+    return ASCIIToUTF16(cells[row % 5][column_id]);
   }
 
   virtual SkBitmap GetIcon(int row) {
     return row % 2 ? icon1 : icon2;
   }
 
   virtual void SetObserver(TableModelObserver* observer) {
   }
 
   // TableViewObserver implementation:
@@ skipping 43 matching lines @@
 
   SkBitmap icon1;
   SkBitmap icon2;
 
   DISALLOW_COPY_AND_ASSIGN(Table2Example);
 };
 
 }  // namespace examples
 
 #endif  // VIEWS_EXAMPLES_TABLE2_EXAMPLE_H_