Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1251)

Unified Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

Issue 7550050: Convert LocationBar::GetInputString from wstring to string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gurl string16 Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
index d6cc961af587d5d1891ce35c6db126116db7fa72..8b32cfbe091b7dab8b2d838a0dc892f7bac7a399 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
@@ -138,7 +138,7 @@ void LocationBarViewMac::ShowFirstRunBubbleInternal(
[FirstRunBubbleController showForView:field_ offset:kOffset profile:profile_];
}
-std::wstring LocationBarViewMac::GetInputString() const {
+string16 LocationBarViewMac::GetInputString() const {
return location_input_;
}
@@ -224,7 +224,7 @@ void LocationBarViewMac::OnAutocompleteAccept(const GURL& url,
// WARNING: don't add an early return here. The calls after the if must
// happen.
if (url.is_valid()) {
- location_input_ = UTF8ToWide(url.spec());
+ location_input_ = UTF8ToUTF16(url.spec());
disposition_ = disposition;
transition_ = transition;
« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698