chrome/browser/encoding_menu_controller.cc - Issue 5154009: Cleanup AdjustStringForLocaleDirection()

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

Issue 5154009: Cleanup AdjustStringForLocaleDirection() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: further fixes Created 10 years, 1 month 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/encoding_menu_controller.cc

diff --git a/chrome/browser/encoding_menu_controller.cc b/chrome/browser/encoding_menu_controller.cc

index d53536d20ea8fb627a6039e61cff98479afb742d..7d3a89ea29093e7261b0af69c08d2864d95b6247 100644

--- a/chrome/browser/encoding_menu_controller.cc

+++ b/chrome/browser/encoding_menu_controller.cc

@@ -131,10 +131,7 @@ void EncodingMenuController::GetEncodingMenuItems(Profile* profile,

for (it = encodings->begin(); it != encodings->end(); ++it) {

if (it->encoding_id) {

std::wstring encoding = it->encoding_display_name;

- std::wstring bidi_safe_encoding;

- if (base::i18n::AdjustStringForLocaleDirection(encoding,

- &bidi_safe_encoding))

- encoding.swap(bidi_safe_encoding);

+ base::i18n::AdjustStringForLocaleDirection(&encoding);

menuItems->push_back(EncodingMenuItem(it->encoding_id,

WideToUTF16(encoding)));

} else {