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

Unified Diff: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

Issue 6256010: Revert 72380 - Remove wstring from autocomplete.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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/cocoa/tabs/tab_strip_controller.mm ('k') | chrome/browser/ui/gtk/gtk_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
===================================================================
--- chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm (revision 72383)
+++ chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm (working copy)
@@ -787,7 +787,8 @@
// If the input is plain text, classify the input and make the URL.
AutocompleteMatch match;
browser_->profile()->GetAutocompleteClassifier()->Classify(
- base::SysNSStringToUTF16(text), string16(), false, &match, NULL);
+ base::SysNSStringToWide(text),
+ std::wstring(), false, &match, NULL);
GURL url(match.destination_url);
browser_->GetSelectedTabContents()->OpenURL(url, GURL(), CURRENT_TAB,
Property changes on: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
___________________________________________________________________
Added: svn:mergeinfo
« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm ('k') | chrome/browser/ui/gtk/gtk_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698