OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/default_encoding_combo_model.h" | 5 #include "chrome/browser/default_encoding_combo_model.h" |
6 | 6 |
7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
8 #include "app/l10n_util_collator.h" | 8 #include "app/l10n_util_collator.h" |
9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
11 #include "chrome/browser/pref_member.h" | 11 #include "chrome/browser/prefs/pref_member.h" |
12 #include "chrome/browser/profile.h" | 12 #include "chrome/browser/profile.h" |
13 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
14 | 14 |
15 DefaultEncodingComboboxModel::DefaultEncodingComboboxModel() { | 15 DefaultEncodingComboboxModel::DefaultEncodingComboboxModel() { |
16 // Initialize the vector of all sorted encodings according to current | 16 // Initialize the vector of all sorted encodings according to current |
17 // UI locale. | 17 // UI locale. |
18 std::string locale = g_browser_process->GetApplicationLocale(); | 18 std::string locale = g_browser_process->GetApplicationLocale(); |
19 int size = CharacterEncoding::GetSupportCanonicalEncodingCount(); | 19 int size = CharacterEncoding::GetSupportCanonicalEncodingCount(); |
20 for (int i = 0; i < size; ++i) { | 20 for (int i = 0; i < size; ++i) { |
21 sorted_encoding_list_.push_back(CharacterEncoding::EncodingInfo( | 21 sorted_encoding_list_.push_back(CharacterEncoding::EncodingInfo( |
(...skipping 19 matching lines...) Expand all Loading... |
41 profile->GetPrefs(), | 41 profile->GetPrefs(), |
42 NULL); | 42 NULL); |
43 const std::string current_encoding = current_encoding_string.GetValue(); | 43 const std::string current_encoding = current_encoding_string.GetValue(); |
44 for (int i = 0; i < GetItemCount(); ++i) { | 44 for (int i = 0; i < GetItemCount(); ++i) { |
45 if (GetEncodingCharsetByIndex(i) == current_encoding) | 45 if (GetEncodingCharsetByIndex(i) == current_encoding) |
46 return i; | 46 return i; |
47 } | 47 } |
48 | 48 |
49 return 0; | 49 return 0; |
50 } | 50 } |
OLD | NEW |