Remove wstring from TableModel....

chrome/browser/custom_home_pages_table_model.h

 // Copyright (c) 2010 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 CHROME_BROWSER_CUSTOM_HOME_PAGES_TABLE_MODEL_H_
 #define CHROME_BROWSER_CUSTOM_HOME_PAGES_TABLE_MODEL_H_
 #pragma once
 
 #include <string>

[viettrungluu, 2010/12/29 23:41:17]

No longer needed, but should probably include base/string16.h.

[Avi (use Gerrit), 2010/12/30 00:04:15]

No, overrides TableModel which includes.

[viettrungluu, 2010/12/30 00:35:13]

I would include it because of the standalone use (for FormattedURL()), but our
rules about inclusions are vague so it's up to you.

 #include <vector>
 
 #include "app/table_model.h"
+#include "base/compiler_specific.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/favicon_service.h"
 
 class GURL;
 class Profile;
 class SkBitmap;
 class TableModelObserver;
 
 // CustomHomePagesTableModel is the model for the TableView showing the list
 // of pages the user wants opened on startup.
@@ skipping 13 matching lines @@
   void Remove(int index);
 
   // Clears any entries and fills the list with pages currently opened in the
   // browser.
   void SetToCurrentlyOpenPages();
 
   // Returns the set of urls this model contains.
   std::vector<GURL> GetURLs();
 
   // TableModel overrides:
-  virtual int RowCount();
-  virtual std::wstring GetText(int row, int column_id);
-  virtual SkBitmap GetIcon(int row);
-  virtual std::wstring GetTooltip(int row);
-  virtual void SetObserver(TableModelObserver* observer);
+  virtual int RowCount() OVERRIDE;
+  virtual string16 GetText(int row, int column_id) OVERRIDE;
+  virtual SkBitmap GetIcon(int row) OVERRIDE;
+  virtual string16 GetTooltip(int row) OVERRIDE;
+  virtual void SetObserver(TableModelObserver* observer) OVERRIDE;
 
  private:
   // Each item in the model is represented as an Entry. Entry stores the URL,
   // title, and favicon of the page.
   struct Entry;
 
   // Loads the title and favicon for the specified entry.
   void LoadTitleAndFavIcon(Entry* entry);
 
   // Callback from history service. Updates the title of the Entry whose
@@ skipping 16 matching lines @@
   Entry* GetEntryByLoadHandle(CancelableRequestProvider::Handle Entry::* member,
                               CancelableRequestProvider::Handle handle,
                               int* entry_index);
 
   // Returns the entry whose |fav_icon_handle| matches |handle| and sets
   // |entry_index| to the index of the entry.
   Entry* GetEntryByFavIconHandle(FaviconService::Handle handle,
                                  int* entry_index);
 
   // Returns the URL for a particular row, formatted for display to the user.
-  std::wstring FormattedURL(int row) const;
+  string16 FormattedURL(int row) const;
 
   // Set of entries we're showing.
   std::vector<Entry> entries_;
 
   // Default icon to show when one can't be found for the URL.
   SkBitmap* default_favicon_;
 
   // Profile used to load titles and icons.
   Profile* profile_;
 
   TableModelObserver* observer_;
 
   // Used in loading titles and favicons.
   CancelableRequestConsumer query_consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomHomePagesTableModel);
 };
 
 #endif  // CHROME_BROWSER_CUSTOM_HOME_PAGES_TABLE_MODEL_H_