| Index: chrome/browser/ui/views/location_bar/keyword_hint_view.h
|
| ===================================================================
|
| --- chrome/browser/ui/views/location_bar/keyword_hint_view.h (revision 72383)
|
| +++ chrome/browser/ui/views/location_bar/keyword_hint_view.h (working copy)
|
| @@ -36,8 +36,8 @@
|
|
|
| void SetColor(const SkColor& color);
|
|
|
| - void SetKeyword(const string16& keyword);
|
| - string16 keyword() const { return keyword_; }
|
| + void SetKeyword(const std::wstring& keyword);
|
| + std::wstring keyword() const { return keyword_; }
|
|
|
| virtual void Paint(gfx::Canvas* canvas);
|
| virtual gfx::Size GetPreferredSize();
|
| @@ -52,7 +52,7 @@
|
| views::Label* trailing_label_;
|
|
|
| // The keyword.
|
| - string16 keyword_;
|
| + std::wstring keyword_;
|
|
|
| Profile* profile_;
|
|
|
|
|
| Property changes on: chrome/browser/ui/views/location_bar/keyword_hint_view.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|