chrome/browser/chromeos/options/language_config_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/chromeos/options/language_config_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/chromeos/options/language_config_model.h

diff --git a/chrome/browser/chromeos/options/language_config_model.h b/chrome/browser/chromeos/options/language_config_model.h

index 4310f77850da73e1d8e3ab5d72890a531c522a3e..031e90e4e68c6bbc1f0c5181092727b3eea9887b 100644

--- a/chrome/browser/chromeos/options/language_config_model.h

+++ b/chrome/browser/chromeos/options/language_config_model.h

@@ -10,6 +10,7 @@

#include <string>

#include <vector>

+#include "base/string16.h"

#include "chrome/browser/language_combobox_model.h"

#include "chrome/browser/pref_member.h"

#include "chrome/browser/pref_service.h"

@@ -27,7 +28,7 @@ class AddLanguageComboboxModel : public ::LanguageComboboxModel {

const std::vector<std::string>& locale_codes);

// LanguageComboboxModel overrides.

virtual int GetItemCount();

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

+ virtual string16 GetItemAt(int index);

// Converts the given index (index of the items in the combobox) to the

// index of the internal language list. The returned index can be used