diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 01:15:47 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 01:15:47 +0000 |
| commit | dcfc6bae35d071427dc4e20aaa3bdfa280523fef (patch) | |
| tree | 317c64cc695a4718780fe79c799380f879e7ac4a /chrome/browser/character_encoding.cc | |
| parent | b652aa0047190a2eaf78507075e86ba4da950744 (diff) | |
| download | chromium_src-dcfc6bae35d071427dc4e20aaa3bdfa280523fef.zip chromium_src-dcfc6bae35d071427dc4e20aaa3bdfa280523fef.tar.gz chromium_src-dcfc6bae35d071427dc4e20aaa3bdfa280523fef.tar.bz2 | |
chrome: Remove 14 exit time destructors and 2 static initializers.
BUG=101600, 94925
TEST=none
TBR=mnissler
Review URL: http://codereview.chromium.org/8573021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110235 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) { |