chrome/browser/default_encoding_combo_model.h - Issue 3159031: Remove wstrings from bookmarks, part 12.

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/default_encoding_combo_model.h

Issue 3159031: Remove wstrings from bookmarks, part 12. (Closed)

Patch Set: rebased ToT Created 10 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/default_encoding_combo_model.h

diff --git a/chrome/browser/default_encoding_combo_model.h b/chrome/browser/default_encoding_combo_model.h

index 56e3b8d82762dcc101bb8752584d9d045b575441..52835071fbcba9f66e56e7d12283a47b23ed4257 100644

--- a/chrome/browser/default_encoding_combo_model.h

+++ b/chrome/browser/default_encoding_combo_model.h

@@ -24,7 +24,7 @@ class DefaultEncodingComboboxModel : public ComboboxModel {

return static_cast<int>(sorted_encoding_list_.size());

}

- virtual std::wstring GetItemAt(int index);

+ virtual string16 GetItemAt(int index);

std::string GetEncodingCharsetByIndex(int index);