summaryrefslogtreecommitdiffstats
path: root/chrome/browser/character_encoding.cc
diff options
context:
space:
mode:
authormaruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-05 21:07:27 +0000
committermaruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-05 21:07:27 +0000
commitd3216441b7726c31fb0ae9b9d90b64421e14ca39 (patch)
tree653882df34541ec7aa37e4024f8fce27fd9ba5b6 /chrome/browser/character_encoding.cc
parentba61ace67a08e56026d2e8034d7a938d2f8e5bd6 (diff)
downloadchromium_src-d3216441b7726c31fb0ae9b9d90b64421e14ca39.zip
chromium_src-d3216441b7726c31fb0ae9b9d90b64421e14ca39.tar.gz
chromium_src-d3216441b7726c31fb0ae9b9d90b64421e14ca39.tar.bz2
NO CODE CHANGE.
Split the lines >80 cols. (Part 1) Review URL: http://codereview.chromium.org/39206 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11032 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/character_encoding.cc')
-rw-r--r--chrome/browser/character_encoding.cc12
1 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc
index c47e6d0..74086fc 100644
--- a/chrome/browser/character_encoding.cc
+++ b/chrome/browser/character_encoding.cc
@@ -85,7 +85,8 @@ class CanonicalEncodingMap {
return &locale_dependent_encoding_ids_;
}
- std::vector<CharacterEncoding::EncodingInfo>* const current_display_encodings() {
+ std::vector<CharacterEncoding::EncodingInfo>* const
+ current_display_encodings() {
return &current_display_encodings_;
}
@@ -98,7 +99,8 @@ class CanonicalEncodingMap {
DISALLOW_EVIL_CONSTRUCTORS(CanonicalEncodingMap);
};
-const IdToCanonicalEncodingNameMapType* CanonicalEncodingMap::GetIdToCanonicalEncodingNameMapData() {
+const IdToCanonicalEncodingNameMapType*
+ CanonicalEncodingMap::GetIdToCanonicalEncodingNameMapData() {
// Testing and building map is not thread safe, this function is supposed to
// only run in UI thread. Myabe I should add a lock in here for making it as
// thread safe.
@@ -114,7 +116,8 @@ const IdToCanonicalEncodingNameMapType* CanonicalEncodingMap::GetIdToCanonicalEn
return id_to_encoding_name_map_.get();
}
-const CanonicalEncodingNameToIdMapType* CanonicalEncodingMap::GetCanonicalEncodingNameToIdMapData() {
+const CanonicalEncodingNameToIdMapType*
+ CanonicalEncodingMap::GetCanonicalEncodingNameToIdMapData() {
if (!encoding_name_to_id_map_.get()) {
encoding_name_to_id_map_.reset(new CanonicalEncodingNameToIdMapType);
for (int i = 0; i < canonical_encoding_names_length; ++i) {
@@ -337,7 +340,8 @@ std::wstring CharacterEncoding::GetCanonicalEncodingNameByAliasName(
// 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::vector<CharacterEncoding::EncodingInfo>*
+ CharacterEncoding::GetCurrentDisplayEncodings(
const std::wstring& locale,
const std::wstring& locale_encodings,
const std::wstring& recently_select_encodings) {