Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(158)

Unified Diff: chrome/browser/character_encoding.cc

Issue 39206: NO CODE CHANGE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/cache_manager_host_unittest.cc ('k') | chrome/browser/cocoa/toolbar_button_cell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/character_encoding.cc
===================================================================
--- chrome/browser/character_encoding.cc (revision 10992)
+++ chrome/browser/character_encoding.cc (working copy)
@@ -85,7 +85,8 @@
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 @@
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 @@
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 @@
// 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) {
« no previous file with comments | « chrome/browser/cache_manager_host_unittest.cc ('k') | chrome/browser/cocoa/toolbar_button_cell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698