chrome/browser/omnibox_search_hint.cc - Issue 5989012: Revert 70281 - Revert 70271 - Remove wstring from l10n_util. Part 3....

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/omnibox_search_hint.cc

Issue 5989012: Revert 70281 - Revert 70271 - Remove wstring from l10n_util. Part 3.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 years 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/notifications/notification_exceptions_table_model_unittest.cc ('k') | chrome/browser/plugin_exceptions_table_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/omnibox_search_hint.cc

===================================================================

--- chrome/browser/omnibox_search_hint.cc (revision 70282)

+++ chrome/browser/omnibox_search_hint.cc (working copy)

@@ -9,6 +9,8 @@

#include "base/command_line.h"

#include "base/metrics/histogram.h"

#include "base/task.h"

+// TODO(avi): remove when conversions not needed any more

+#include "base/utf_string_conversions.h"

#include "chrome/browser/autocomplete/autocomplete.h"

#include "chrome/browser/autocomplete/autocomplete_edit.h"

#include "chrome/browser/autocomplete/autocomplete_edit_view.h"

@@ -183,8 +185,8 @@

GetLocationBar();

AutocompleteEditView* edit_view = location_bar->location_entry();

location_bar->FocusLocation(true);

- edit_view->SetUserText(

- l10n_util::GetString(IDS_OMNIBOX_SEARCH_HINT_OMNIBOX_TEXT));

+ edit_view->SetUserText(UTF16ToWideHack(

+ l10n_util::GetStringUTF16(IDS_OMNIBOX_SEARCH_HINT_OMNIBOX_TEXT)));

edit_view->SelectAll(false);

// Entering text in the autocomplete edit view triggers the suggestion popup

// that we don't want to show in this case.