Remove wstring from autocomplete.

chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h

Index: chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h
===================================================================
--- chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h	(revision 72388)
+++ chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h	(working copy)
@@ -10,6 +10,7 @@
 
 #import <Cocoa/Cocoa.h>
 
+#include "base/string16.h"
 #include "chrome/browser/ui/cocoa/location_bar/bubble_decoration.h"
 
 class SelectedKeywordDecoration : public BubbleDecoration {
@@ -18,7 +19,7 @@
 
   // Calculates appropriate full and partial label strings based on
   // inputs.
-  void SetKeyword(const std::wstring& keyword, bool is_extension_keyword);
+  void SetKeyword(const string16& keyword, bool is_extension_keyword);
 
   // Determines what combination of labels and image will best fit
   // within |width|, makes those current for |BubbleDecoration|, and
Property changes on: chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h
___________________________________________________________________
Deleted: svn:mergeinfo