Remove wstring from TableModel....

chrome/browser/search_engines/template_url_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_SEARCH_ENGINES_TEMPLATE_URL_TABLE_MODEL_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_TABLE_MODEL_H_
 #pragma once
 
 #include "app/table_model.h"
+#include "base/compiler_specific.h"
 #include "base/string16.h"
 #include "chrome/browser/search_engines/template_url_model_observer.h"
 
 class ModelEntry;
 class SkBitmap;
 class TemplateURL;
 class TemplateURLModel;
 
 // TemplateURLTableModel is the TableModel implementation used by
 // KeywordEditorView to show the keywords in a TableView.
@@ skipping 11 matching lines @@
  public:
   explicit TemplateURLTableModel(TemplateURLModel* template_url_model);
 
   virtual ~TemplateURLTableModel();
 
   // Reloads the entries from the TemplateURLModel. This should ONLY be invoked
   // if the TemplateURLModel wasn't initially loaded and has been loaded.
   void Reload();
 
   // TableModel overrides.
-  virtual int RowCount();
-  virtual std::wstring GetText(int row, int column);
-  virtual SkBitmap GetIcon(int row);
-  virtual void SetObserver(TableModelObserver* observer);
-  virtual bool HasGroups();
-  virtual Groups GetGroups();
-  virtual int GetGroupID(int row);
+  virtual int RowCount() OVERRIDE;
+  virtual string16 GetText(int row, int column) OVERRIDE;
+  virtual SkBitmap GetIcon(int row) OVERRIDE;
+  virtual void SetObserver(TableModelObserver* observer) OVERRIDE;
+  virtual bool HasGroups() OVERRIDE;
+  virtual Groups GetGroups() OVERRIDE;
+  virtual int GetGroupID(int row) OVERRIDE;
 
   // Removes the entry at the specified index.
   void Remove(int index);
 
   // Adds a new entry at the specified index.
   void Add(int index, TemplateURL* template_url);
 
   // Update the entry at the specified index.
   void ModifyTemplateURL(int index,
                          const string16& title,
                          const string16& keyword,
                          const std::string& url);

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

Probably <string> should be included as a drive-by fix.

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

Done.

 
   // Reloads the icon at the specified index.
   void ReloadIcon(int index);
 
   // Returns The TemplateURL at the specified index.
   const TemplateURL& GetTemplateURL(int index);
 
   // Returns the index of the TemplateURL, or -1 if it the TemplateURL is not
   // found.
   int IndexOfTemplateURL(const TemplateURL* template_url);
@@ skipping 20 matching lines @@
 
   // Notification that a model entry has fetched its icon.
   void FavIconAvailable(ModelEntry* entry);
 
   // TemplateURLModelObserver notification.
   virtual void OnTemplateURLModelChanged();
 
   TableModelObserver* observer_;
 
   // The entries.
   std::vector<ModelEntry*> entries_;

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

And <vector> too, I guess.

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

Done.

 
   // The model we're displaying entries from.
   TemplateURLModel* template_url_model_;
 
   // Index of the last search engine in entries_. This is used to determine the
   // group boundaries.
   int last_search_engine_index_;
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURLTableModel);
 };
 
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_TABLE_MODEL_H_