Revert 72380 - Remove wstring from autocomplete....

chrome/browser/ui/gtk/location_bar_view_gtk.h

Index: chrome/browser/ui/gtk/location_bar_view_gtk.h
===================================================================
--- chrome/browser/ui/gtk/location_bar_view_gtk.h	(revision 72383)
+++ chrome/browser/ui/gtk/location_bar_view_gtk.h	(working copy)
@@ -95,7 +95,7 @@
   virtual void OnAutocompleteLosingFocus(gfx::NativeView view_gaining_focus);
   virtual void OnAutocompleteWillAccept();
   // For this implementation, the parameter is ignored.
-  virtual bool OnCommitSuggestedText(const string16& typed_text);
+  virtual bool OnCommitSuggestedText(const std::wstring& typed_text);
   virtual bool AcceptCurrentInstantPreview();
   virtual void OnPopupBoundsChanged(const gfx::Rect& bounds);
   virtual void OnAutocompleteAccept(const GURL& url,
@@ -108,7 +108,7 @@
   virtual void OnSetFocus();
   virtual void OnInputInProgress(bool in_progress);
   virtual SkBitmap GetFavIcon() const;
-  virtual string16 GetTitle() const;
+  virtual std::wstring GetTitle() const;
 
   // Implement the LocationBar interface.
   virtual void ShowFirstRunBubble(FirstRun::BubbleType bubble_type);
@@ -313,10 +313,10 @@
   void SetInfoText();
 
   // Set the keyword text for the Search BLAH: keyword box.
-  void SetKeywordLabel(const string16& keyword);
+  void SetKeywordLabel(const std::wstring& keyword);
 
   // Set the keyword text for the "Press tab to search BLAH" hint box.
-  void SetKeywordHintLabel(const string16& keyword);
+  void SetKeywordHintLabel(const std::wstring& keyword);
 
   void ShowFirstRunBubbleInternal(FirstRun::BubbleType bubble_type);
 
@@ -423,7 +423,7 @@
   bool show_keyword_hint_;
 
   // The last search keyword that was shown via the |tab_to_search_box_|.
-  string16 last_keyword_;
+  std::wstring last_keyword_;
 
   // True if we should update the instant controller when the edit text changes.
   bool update_instant_;
Property changes on: chrome/browser/ui/gtk/location_bar_view_gtk.h
___________________________________________________________________
Added: svn:mergeinfo