diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 18:37:40 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 18:37:40 +0000 |
| commit | 02c3f683b160a23afe889ab195ed2dc196a098fe (patch) | |
| tree | bbd8b0e40aa762682d756fbaa73b21045b07390a /chrome/browser/character_encoding.cc | |
| parent | 85d7bcf6ff662687704edd521f53b003c68ef9a2 (diff) | |
| download | chromium_src-02c3f683b160a23afe889ab195ed2dc196a098fe.zip chromium_src-02c3f683b160a23afe889ab195ed2dc196a098fe.tar.gz chromium_src-02c3f683b160a23afe889ab195ed2dc196a098fe.tar.bz2 | |
chrome: Remove 14 exit time destructors and 2 static initializers.
BUG=101600, 94925
TEST=none
TBR=mnissler
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=110235
Review URL: http://codereview.chromium.org/8573021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110330 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 ec433af..460da9e 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 toppest position, after then put user -// recently selected encodings, then put local dependent encoding items. -// At last, we put all rest encoding items. +// 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. 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); - static std::string cached_user_selected_encodings; + CR_DEFINE_STATIC_LOCAL(std::string, cached_user_selected_encodings, ()); // Build current display encoding list. if (encoding_list->empty() || cached_user_selected_encodings != recently_select_encodings) { |