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

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

Issue 649413002: Roll src/third_party/icu 8ac906f:d8b2a9d (svn 292317:292476) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: space/indent fix Created 6 years, 2 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
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 544 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 case IDC_MANAGE_PASSWORDS_FOR_PAGE: 555 case IDC_MANAGE_PASSWORDS_FOR_PAGE:
556 ManagePasswordsForPage(browser_); 556 ManagePasswordsForPage(browser_);
557 break; 557 break;
558 558
559 // Page encoding commands 559 // Page encoding commands
560 case IDC_ENCODING_AUTO_DETECT: 560 case IDC_ENCODING_AUTO_DETECT:
561 browser_->ToggleEncodingAutoDetect(); 561 browser_->ToggleEncodingAutoDetect();
562 break; 562 break;
563 case IDC_ENCODING_UTF8: 563 case IDC_ENCODING_UTF8:
564 case IDC_ENCODING_UTF16LE: 564 case IDC_ENCODING_UTF16LE:
565 case IDC_ENCODING_ISO88591:
566 case IDC_ENCODING_WINDOWS1252: 565 case IDC_ENCODING_WINDOWS1252:
567 case IDC_ENCODING_GBK: 566 case IDC_ENCODING_GBK:
568 case IDC_ENCODING_GB18030: 567 case IDC_ENCODING_GB18030:
569 case IDC_ENCODING_BIG5HKSCS: 568 case IDC_ENCODING_BIG5HKSCS:
570 case IDC_ENCODING_BIG5: 569 case IDC_ENCODING_BIG5:
571 case IDC_ENCODING_KOREAN: 570 case IDC_ENCODING_KOREAN:
572 case IDC_ENCODING_SHIFTJIS: 571 case IDC_ENCODING_SHIFTJIS:
573 case IDC_ENCODING_ISO2022JP: 572 case IDC_ENCODING_ISO2022JP:
574 case IDC_ENCODING_EUCJP: 573 case IDC_ENCODING_EUCJP:
575 case IDC_ENCODING_THAI: 574 case IDC_ENCODING_THAI:
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
902 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 901 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
903 command_updater_.UpdateCommandEnabled(IDC_USE_SYSTEM_TITLE_BAR, true); 902 command_updater_.UpdateCommandEnabled(IDC_USE_SYSTEM_TITLE_BAR, true);
904 #endif 903 #endif
905 904
906 // Page-related commands 905 // Page-related commands
907 command_updater_.UpdateCommandEnabled(IDC_EMAIL_PAGE_LOCATION, true); 906 command_updater_.UpdateCommandEnabled(IDC_EMAIL_PAGE_LOCATION, true);
908 command_updater_.UpdateCommandEnabled(IDC_MANAGE_PASSWORDS_FOR_PAGE, true); 907 command_updater_.UpdateCommandEnabled(IDC_MANAGE_PASSWORDS_FOR_PAGE, true);
909 command_updater_.UpdateCommandEnabled(IDC_ENCODING_AUTO_DETECT, true); 908 command_updater_.UpdateCommandEnabled(IDC_ENCODING_AUTO_DETECT, true);
910 command_updater_.UpdateCommandEnabled(IDC_ENCODING_UTF8, true); 909 command_updater_.UpdateCommandEnabled(IDC_ENCODING_UTF8, true);
911 command_updater_.UpdateCommandEnabled(IDC_ENCODING_UTF16LE, true); 910 command_updater_.UpdateCommandEnabled(IDC_ENCODING_UTF16LE, true);
912 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88591, true);
913 command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1252, true); 911 command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1252, true);
914 command_updater_.UpdateCommandEnabled(IDC_ENCODING_GBK, true); 912 command_updater_.UpdateCommandEnabled(IDC_ENCODING_GBK, true);
915 command_updater_.UpdateCommandEnabled(IDC_ENCODING_GB18030, true); 913 command_updater_.UpdateCommandEnabled(IDC_ENCODING_GB18030, true);
916 command_updater_.UpdateCommandEnabled(IDC_ENCODING_BIG5HKSCS, true); 914 command_updater_.UpdateCommandEnabled(IDC_ENCODING_BIG5HKSCS, true);
917 command_updater_.UpdateCommandEnabled(IDC_ENCODING_BIG5, true); 915 command_updater_.UpdateCommandEnabled(IDC_ENCODING_BIG5, true);
918 command_updater_.UpdateCommandEnabled(IDC_ENCODING_THAI, true); 916 command_updater_.UpdateCommandEnabled(IDC_ENCODING_THAI, true);
919 command_updater_.UpdateCommandEnabled(IDC_ENCODING_KOREAN, true); 917 command_updater_.UpdateCommandEnabled(IDC_ENCODING_KOREAN, true);
920 command_updater_.UpdateCommandEnabled(IDC_ENCODING_SHIFTJIS, true); 918 command_updater_.UpdateCommandEnabled(IDC_ENCODING_SHIFTJIS, true);
921 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO2022JP, true); 919 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO2022JP, true);
922 command_updater_.UpdateCommandEnabled(IDC_ENCODING_EUCJP, true); 920 command_updater_.UpdateCommandEnabled(IDC_ENCODING_EUCJP, true);
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
1350 1348
1351 BrowserWindow* BrowserCommandController::window() { 1349 BrowserWindow* BrowserCommandController::window() {
1352 return browser_->window(); 1350 return browser_->window();
1353 } 1351 }
1354 1352
1355 Profile* BrowserCommandController::profile() { 1353 Profile* BrowserCommandController::profile() {
1356 return browser_->profile(); 1354 return browser_->profile();
1357 } 1355 }
1358 1356
1359 } // namespace chrome 1357 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/download/save_page_browsertest.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