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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/ui/browser_command_controller.cc

Issue 1024713002: Drop Big5-HKSCS and add IBM866 in the encoding menu. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix EncodingMenuControllerTest.EncodingIDsBelongTest Created 5 years, 9 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
« no previous file with comments | « chrome/browser/character_encoding.cc ('k') | chrome/browser/ui/toolbar/encoding_menu_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/browser_command_controller.h" 5 #include "chrome/browser/ui/browser_command_controller.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 563
564 // Page encoding commands 564 // Page encoding commands
565 case IDC_ENCODING_AUTO_DETECT: 565 case IDC_ENCODING_AUTO_DETECT:
566 browser_->ToggleEncodingAutoDetect(); 566 browser_->ToggleEncodingAutoDetect();
567 break; 567 break;
568 case IDC_ENCODING_UTF8: 568 case IDC_ENCODING_UTF8:
569 case IDC_ENCODING_UTF16LE: 569 case IDC_ENCODING_UTF16LE:
570 case IDC_ENCODING_WINDOWS1252: 570 case IDC_ENCODING_WINDOWS1252:
571 case IDC_ENCODING_GBK: 571 case IDC_ENCODING_GBK:
572 case IDC_ENCODING_GB18030: 572 case IDC_ENCODING_GB18030:
573 case IDC_ENCODING_BIG5HKSCS:
574 case IDC_ENCODING_BIG5: 573 case IDC_ENCODING_BIG5:
575 case IDC_ENCODING_KOREAN: 574 case IDC_ENCODING_KOREAN:
576 case IDC_ENCODING_SHIFTJIS: 575 case IDC_ENCODING_SHIFTJIS:
577 case IDC_ENCODING_ISO2022JP: 576 case IDC_ENCODING_ISO2022JP:
578 case IDC_ENCODING_EUCJP: 577 case IDC_ENCODING_EUCJP:
579 case IDC_ENCODING_THAI: 578 case IDC_ENCODING_THAI:
580 case IDC_ENCODING_ISO885915: 579 case IDC_ENCODING_ISO885915:
581 case IDC_ENCODING_MACINTOSH: 580 case IDC_ENCODING_MACINTOSH:
582 case IDC_ENCODING_ISO88592: 581 case IDC_ENCODING_ISO88592:
583 case IDC_ENCODING_WINDOWS1250: 582 case IDC_ENCODING_WINDOWS1250:
584 case IDC_ENCODING_ISO88595: 583 case IDC_ENCODING_ISO88595:
585 case IDC_ENCODING_WINDOWS1251: 584 case IDC_ENCODING_WINDOWS1251:
586 case IDC_ENCODING_KOI8R: 585 case IDC_ENCODING_KOI8R:
587 case IDC_ENCODING_KOI8U: 586 case IDC_ENCODING_KOI8U:
587 case IDC_ENCODING_IBM866:
588 case IDC_ENCODING_ISO88597: 588 case IDC_ENCODING_ISO88597:
589 case IDC_ENCODING_WINDOWS1253: 589 case IDC_ENCODING_WINDOWS1253:
590 case IDC_ENCODING_ISO88594: 590 case IDC_ENCODING_ISO88594:
591 case IDC_ENCODING_ISO885913: 591 case IDC_ENCODING_ISO885913:
592 case IDC_ENCODING_WINDOWS1257: 592 case IDC_ENCODING_WINDOWS1257:
593 case IDC_ENCODING_ISO88593: 593 case IDC_ENCODING_ISO88593:
594 case IDC_ENCODING_ISO885910: 594 case IDC_ENCODING_ISO885910:
595 case IDC_ENCODING_ISO885914: 595 case IDC_ENCODING_ISO885914:
596 case IDC_ENCODING_ISO885916: 596 case IDC_ENCODING_ISO885916:
597 case IDC_ENCODING_WINDOWS1254: 597 case IDC_ENCODING_WINDOWS1254:
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
909 909
910 // Page-related commands 910 // Page-related commands
911 command_updater_.UpdateCommandEnabled(IDC_EMAIL_PAGE_LOCATION, true); 911 command_updater_.UpdateCommandEnabled(IDC_EMAIL_PAGE_LOCATION, true);
912 command_updater_.UpdateCommandEnabled(IDC_MANAGE_PASSWORDS_FOR_PAGE, true); 912 command_updater_.UpdateCommandEnabled(IDC_MANAGE_PASSWORDS_FOR_PAGE, true);
913 command_updater_.UpdateCommandEnabled(IDC_ENCODING_AUTO_DETECT, true); 913 command_updater_.UpdateCommandEnabled(IDC_ENCODING_AUTO_DETECT, true);
914 command_updater_.UpdateCommandEnabled(IDC_ENCODING_UTF8, true); 914 command_updater_.UpdateCommandEnabled(IDC_ENCODING_UTF8, true);
915 command_updater_.UpdateCommandEnabled(IDC_ENCODING_UTF16LE, true); 915 command_updater_.UpdateCommandEnabled(IDC_ENCODING_UTF16LE, true);
916 command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1252, true); 916 command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1252, true);
917 command_updater_.UpdateCommandEnabled(IDC_ENCODING_GBK, true); 917 command_updater_.UpdateCommandEnabled(IDC_ENCODING_GBK, true);
918 command_updater_.UpdateCommandEnabled(IDC_ENCODING_GB18030, true); 918 command_updater_.UpdateCommandEnabled(IDC_ENCODING_GB18030, true);
919 command_updater_.UpdateCommandEnabled(IDC_ENCODING_BIG5HKSCS, true);
920 command_updater_.UpdateCommandEnabled(IDC_ENCODING_BIG5, true); 919 command_updater_.UpdateCommandEnabled(IDC_ENCODING_BIG5, true);
921 command_updater_.UpdateCommandEnabled(IDC_ENCODING_THAI, true); 920 command_updater_.UpdateCommandEnabled(IDC_ENCODING_THAI, true);
922 command_updater_.UpdateCommandEnabled(IDC_ENCODING_KOREAN, true); 921 command_updater_.UpdateCommandEnabled(IDC_ENCODING_KOREAN, true);
923 command_updater_.UpdateCommandEnabled(IDC_ENCODING_SHIFTJIS, true); 922 command_updater_.UpdateCommandEnabled(IDC_ENCODING_SHIFTJIS, true);
924 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO2022JP, true); 923 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO2022JP, true);
925 command_updater_.UpdateCommandEnabled(IDC_ENCODING_EUCJP, true); 924 command_updater_.UpdateCommandEnabled(IDC_ENCODING_EUCJP, true);
926 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO885915, true); 925 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO885915, true);
927 command_updater_.UpdateCommandEnabled(IDC_ENCODING_MACINTOSH, true); 926 command_updater_.UpdateCommandEnabled(IDC_ENCODING_MACINTOSH, true);
928 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88592, true); 927 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88592, true);
929 command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1250, true); 928 command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1250, true);
930 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88595, true); 929 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88595, true);
931 command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1251, true); 930 command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1251, true);
932 command_updater_.UpdateCommandEnabled(IDC_ENCODING_KOI8R, true); 931 command_updater_.UpdateCommandEnabled(IDC_ENCODING_KOI8R, true);
933 command_updater_.UpdateCommandEnabled(IDC_ENCODING_KOI8U, true); 932 command_updater_.UpdateCommandEnabled(IDC_ENCODING_KOI8U, true);
933 command_updater_.UpdateCommandEnabled(IDC_ENCODING_IBM866, true);
934 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88597, true); 934 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88597, true);
935 command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1253, true); 935 command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1253, true);
936 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88594, true); 936 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88594, true);
937 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO885913, true); 937 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO885913, true);
938 command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1257, true); 938 command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1257, true);
939 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88593, true); 939 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88593, true);
940 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO885910, true); 940 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO885910, true);
941 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO885914, true); 941 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO885914, true);
942 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO885916, true); 942 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO885916, true);
943 command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1254, true); 943 command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1254, true);
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
1356 1356
1357 BrowserWindow* BrowserCommandController::window() { 1357 BrowserWindow* BrowserCommandController::window() {
1358 return browser_->window(); 1358 return browser_->window();
1359 } 1359 }
1360 1360
1361 Profile* BrowserCommandController::profile() { 1361 Profile* BrowserCommandController::profile() {
1362 return browser_->profile(); 1362 return browser_->profile();
1363 } 1363 }
1364 1364
1365 } // namespace chrome 1365 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/character_encoding.cc ('k') | chrome/browser/ui/toolbar/encoding_menu_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698