chrome/browser/ui/gtk/location_bar_view_gtk.cc - Issue 7550050: Convert LocationBar::GetInputString from wstring to string16.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/gtk/location_bar_view_gtk.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:

Index: chrome/browser/ui/gtk/location_bar_view_gtk.cc

diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc

index 6bd7fa38ed07528575b1eb1d9d96efdac3f60bfb..10fc40d7a903f358301c444ffcb47e572f3a11dc 100644

--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc

+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc

@@ -472,7 +472,7 @@ void LocationBarViewGtk::OnAutocompleteAccept(const GURL& url,

PageTransition::Type transition,

const GURL& alternate_nav_url) {

if (url.is_valid()) {

- location_input_ = UTF8ToWide(url.spec());

+ location_input_ = UTF8ToUTF16(url.spec());

disposition_ = disposition;

transition_ = transition;

@@ -596,7 +596,7 @@ void LocationBarViewGtk::SetSuggestedText(const string16& text,

location_entry_->model()->SetSuggestedText(text, behavior);

}

-std::wstring LocationBarViewGtk::GetInputString() const {

+string16 LocationBarViewGtk::GetInputString() const {

return location_input_;

}