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

Side by Side Diff: chrome/browser/ui/toolbar/encoding_menu_controller.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" 5 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/prefs/pref_service.h"
8 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
9 #include "chrome/app/chrome_command_ids.h" 10 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/character_encoding.h" 12 #include "chrome/browser/character_encoding.h"
12 #include "chrome/browser/prefs/pref_service.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
15 #include "grit/generated_resources.h" 15 #include "grit/generated_resources.h"
16 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
17 17
18 const int EncodingMenuController::kValidEncodingIds[] = { 18 const int EncodingMenuController::kValidEncodingIds[] = {
19 IDC_ENCODING_UTF8, 19 IDC_ENCODING_UTF8,
20 IDC_ENCODING_UTF16LE, 20 IDC_ENCODING_UTF16LE,
21 IDC_ENCODING_ISO88591, 21 IDC_ENCODING_ISO88591,
22 IDC_ENCODING_WINDOWS1252, 22 IDC_ENCODING_WINDOWS1252,
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 for (it = encodings->begin(); it != encodings->end(); ++it) { 131 for (it = encodings->begin(); it != encodings->end(); ++it) {
132 if (it->encoding_id) { 132 if (it->encoding_id) {
133 string16 encoding = it->encoding_display_name; 133 string16 encoding = it->encoding_display_name;
134 base::i18n::AdjustStringForLocaleDirection(&encoding); 134 base::i18n::AdjustStringForLocaleDirection(&encoding);
135 menu_items->push_back(EncodingMenuItem(it->encoding_id, encoding)); 135 menu_items->push_back(EncodingMenuItem(it->encoding_id, encoding));
136 } else { 136 } else {
137 menu_items->push_back(separator); 137 menu_items->push_back(separator);
138 } 138 }
139 } 139 }
140 } 140 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/back_forward_menu_model.cc ('k') | chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698