diff options
| author | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 01:56:35 +0000 |
|---|---|---|
| committer | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 01:56:35 +0000 |
| commit | 9f66d3066829486700ed7ac72328defcd2196ff3 (patch) | |
| tree | eb836489bb6e29d77fdffc258b1a8039e257868f /chrome/browser/character_encoding.cc | |
| parent | 6f7e5bc02b5edc14761ad17fd5abd4e97e9d1553 (diff) | |
| download | chromium_src-9f66d3066829486700ed7ac72328defcd2196ff3.zip chromium_src-9f66d3066829486700ed7ac72328defcd2196ff3.tar.gz chromium_src-9f66d3066829486700ed7ac72328defcd2196ff3.tar.bz2 | |
Revert 110235 - chrome: Remove 14 exit time destructors and 2 static initializers.
BUG=101600, 94925
TEST=none
TBR=mnissler
Review URL: http://codereview.chromium.org/8573021
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/8568039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/character_encoding.cc')
| -rw-r--r-- | chrome/browser/character_encoding.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc index 460da9e..ec433af 100644 --- a/chrome/browser/character_encoding.cc +++ b/chrome/browser/character_encoding.cc @@ -410,9 +410,9 @@ std::string CharacterEncoding::GetCanonicalEncodingNameByAliasName( // Static // According to the behavior of user recently selected encoding short list in -// Firefox, we always put UTF-8 as top position, after then put user -// recent selected encodings, then put local dependent encoding items. -// At last, we put all remaining encoding items. +// FireFox, we always put UTF-8 as toppest position, after then put user +// recently selected encodings, then put local dependent encoding items. +// At last, we put all rest encoding items. const std::vector<CharacterEncoding::EncodingInfo>* CharacterEncoding::GetCurrentDisplayEncodings( const std::string& locale, @@ -429,7 +429,7 @@ const std::vector<CharacterEncoding::EncodingInfo>* locale_dependent_encoding_list, kUserSelectedEncodingsMaxLength); - CR_DEFINE_STATIC_LOCAL(std::string, cached_user_selected_encodings, ()); + static std::string cached_user_selected_encodings; // Build current display encoding list. if (encoding_list->empty() || cached_user_selected_encodings != recently_select_encodings) { |