Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h |
=================================================================== |
--- chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h (revision 72388) |
+++ chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h (working copy) |
@@ -132,7 +132,7 @@ |
virtual void OnAutocompleteWillClosePopup(); |
virtual void OnAutocompleteLosingFocus(gfx::NativeView unused); |
virtual void OnAutocompleteWillAccept(); |
- virtual bool OnCommitSuggestedText(const std::wstring& typed_text); |
+ virtual bool OnCommitSuggestedText(const string16& typed_text); |
virtual bool AcceptCurrentInstantPreview(); |
virtual void OnPopupBoundsChanged(const gfx::Rect& bounds); |
virtual void OnAutocompleteAccept(const GURL& url, |
@@ -145,9 +145,9 @@ |
virtual void OnKillFocus(); |
virtual void OnSetFocus(); |
virtual SkBitmap GetFavIcon() const; |
- virtual std::wstring GetTitle() const; |
+ virtual string16 GetTitle() const; |
- NSImage* GetKeywordImage(const std::wstring& keyword); |
+ NSImage* GetKeywordImage(const string16& keyword); |
AutocompleteTextField* GetAutocompleteTextField() { return field_; } |
Property changes on: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h |
___________________________________________________________________ |
Deleted: svn:mergeinfo |