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

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

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
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.h ('k') | chrome/test/base/test_location_bar.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 9cacd23b398c9e4dded4575f0cf53b564d98c7a3..34069d2deb470620b41ac557fa9fe28852acb5ce 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -817,7 +817,7 @@ void LocationBarView::OnAutocompleteAccept(
// 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;
@@ -1131,7 +1131,7 @@ void LocationBarView::SetSuggestedText(const string16& text,
location_entry_->model()->SetSuggestedText(text, behavior);
}
-std::wstring LocationBarView::GetInputString() const {
+string16 LocationBarView::GetInputString() const {
return location_input_;
}
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.h ('k') | chrome/test/base/test_location_bar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698