chrome/browser/cocoa/browser_window_controller.mm - Issue 192017: Convert std::wstring encoding names to std::string in a bunch of files.

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/cocoa/browser_window_controller.mm

Issue 192017: Convert std::wstring encoding names to std::string in a bunch of files. (Closed)

Patch Set: mac and linux fixes Created 11 years, 3 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/cocoa/browser_window_controller.mm

diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm

index f71b0ff3257909355cc17096fda9b44ea240c6a8..8971cea236d3ab9565b861d9f83141e5b3171de3 100644

--- a/chrome/browser/cocoa/browser_window_controller.mm

+++ b/chrome/browser/cocoa/browser_window_controller.mm

@@ -519,7 +519,7 @@ willPositionSheet:(NSWindow*)sheet

if (!current_tab) {

return;

}

- const std::wstring encoding = current_tab->encoding();

+ const std::string encoding = current_tab->encoding();

bool toggled = encoding_controller.IsItemChecked(profile, encoding, tag);

NSInteger oldState = [item state];