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

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

Issue 4710001: Split out command IDs from chrome_dll_resource.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years, 1 month 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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/encoding_menu_controller.h" 5 #include "chrome/browser/encoding_menu_controller.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/i18n/rtl.h" 8 #include "base/i18n/rtl.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/app/chrome_dll_resource.h" 10 #include "chrome/app/chrome_command_ids.h"
11 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/character_encoding.h" 12 #include "chrome/browser/character_encoding.h"
13 #include "chrome/browser/prefs/pref_service.h" 13 #include "chrome/browser/prefs/pref_service.h"
14 #include "chrome/browser/profile.h" 14 #include "chrome/browser/profile.h"
15 #include "chrome/common/pref_names.h" 15 #include "chrome/common/pref_names.h"
16 #include "grit/generated_resources.h" 16 #include "grit/generated_resources.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,
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 if (base::i18n::AdjustStringForLocaleDirection(encoding, 135 if (base::i18n::AdjustStringForLocaleDirection(encoding,
136 &bidi_safe_encoding)) 136 &bidi_safe_encoding))
137 encoding.swap(bidi_safe_encoding); 137 encoding.swap(bidi_safe_encoding);
138 menuItems->push_back(EncodingMenuItem(it->encoding_id, 138 menuItems->push_back(EncodingMenuItem(it->encoding_id,
139 WideToUTF16(encoding))); 139 WideToUTF16(encoding)));
140 } else { 140 } else {
141 menuItems->push_back(separator); 141 menuItems->push_back(separator);
142 } 142 }
143 } 143 }
144 } 144 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698