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

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

Issue 132233003: Adding a menu item to take a screenshot under "More Tools" submenu in the Wrench menu. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 11 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 668 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 break; 679 break;
680 case IDC_DEV_TOOLS_INSPECT: 680 case IDC_DEV_TOOLS_INSPECT:
681 ToggleDevToolsWindow(browser_, DevToolsToggleAction::Inspect()); 681 ToggleDevToolsWindow(browser_, DevToolsToggleAction::Inspect());
682 break; 682 break;
683 case IDC_DEV_TOOLS_TOGGLE: 683 case IDC_DEV_TOOLS_TOGGLE:
684 ToggleDevToolsWindow(browser_, DevToolsToggleAction::Toggle()); 684 ToggleDevToolsWindow(browser_, DevToolsToggleAction::Toggle());
685 break; 685 break;
686 case IDC_TASK_MANAGER: 686 case IDC_TASK_MANAGER:
687 OpenTaskManager(browser_); 687 OpenTaskManager(browser_);
688 break; 688 break;
689 #if defined(OS_CHROMEOS)
tdanderson 2014/01/09 20:28:40 If you are surrounding the body of TakeScreenshot(
mfomitchev 2014/01/09 21:11:45 Done.
690 case IDC_TAKE_SCREENSHOT:
691 TakeScreenshot();
692 break;
693 #endif
689 #if defined(GOOGLE_CHROME_BUILD) 694 #if defined(GOOGLE_CHROME_BUILD)
690 case IDC_FEEDBACK: 695 case IDC_FEEDBACK:
691 OpenFeedbackDialog(browser_); 696 OpenFeedbackDialog(browser_);
692 break; 697 break;
693 #endif 698 #endif
694 case IDC_SHOW_BOOKMARK_BAR: 699 case IDC_SHOW_BOOKMARK_BAR:
695 ToggleBookmarkBar(browser_); 700 ToggleBookmarkBar(browser_);
696 break; 701 break;
697 case IDC_PROFILING_ENABLED: 702 case IDC_PROFILING_ENABLED:
698 Profiling::Toggle(); 703 Profiling::Toggle();
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
945 command_updater_.UpdateCommandEnabled(IDC_ZOOM_MENU, true); 950 command_updater_.UpdateCommandEnabled(IDC_ZOOM_MENU, true);
946 command_updater_.UpdateCommandEnabled(IDC_ZOOM_PLUS, true); 951 command_updater_.UpdateCommandEnabled(IDC_ZOOM_PLUS, true);
947 command_updater_.UpdateCommandEnabled(IDC_ZOOM_NORMAL, true); 952 command_updater_.UpdateCommandEnabled(IDC_ZOOM_NORMAL, true);
948 command_updater_.UpdateCommandEnabled(IDC_ZOOM_MINUS, true); 953 command_updater_.UpdateCommandEnabled(IDC_ZOOM_MINUS, true);
949 954
950 // Show various bits of UI 955 // Show various bits of UI
951 UpdateOpenFileState(&command_updater_); 956 UpdateOpenFileState(&command_updater_);
952 command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS, false); 957 command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS, false);
953 UpdateCommandsForDevTools(); 958 UpdateCommandsForDevTools();
954 command_updater_.UpdateCommandEnabled(IDC_TASK_MANAGER, CanOpenTaskManager()); 959 command_updater_.UpdateCommandEnabled(IDC_TASK_MANAGER, CanOpenTaskManager());
960 command_updater_.UpdateCommandEnabled(IDC_TAKE_SCREENSHOT, true);
tdanderson 2014/01/09 20:28:40 I think this line should be ok as-is given that yo
mfomitchev 2014/01/09 21:11:45 Done.
955 command_updater_.UpdateCommandEnabled(IDC_SHOW_HISTORY, 961 command_updater_.UpdateCommandEnabled(IDC_SHOW_HISTORY,
956 !profile()->IsGuestSession()); 962 !profile()->IsGuestSession());
957 command_updater_.UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, true); 963 command_updater_.UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, true);
958 command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE_VIA_KEYBOARD, true); 964 command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE_VIA_KEYBOARD, true);
959 command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE_VIA_MENU, true); 965 command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE_VIA_MENU, true);
960 command_updater_.UpdateCommandEnabled(IDC_BOOKMARKS_MENU, 966 command_updater_.UpdateCommandEnabled(IDC_BOOKMARKS_MENU,
961 !profile()->IsGuestSession()); 967 !profile()->IsGuestSession());
962 command_updater_.UpdateCommandEnabled(IDC_RECENT_TABS_MENU, 968 command_updater_.UpdateCommandEnabled(IDC_RECENT_TABS_MENU,
963 !profile()->IsGuestSession() && 969 !profile()->IsGuestSession() &&
964 !profile()->IsOffTheRecord()); 970 !profile()->IsOffTheRecord());
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
1340 1346
1341 BrowserWindow* BrowserCommandController::window() { 1347 BrowserWindow* BrowserCommandController::window() {
1342 return browser_->window(); 1348 return browser_->window();
1343 } 1349 }
1344 1350
1345 Profile* BrowserCommandController::profile() { 1351 Profile* BrowserCommandController::profile() {
1346 return browser_->profile(); 1352 return browser_->profile();
1347 } 1353 }
1348 1354
1349 } // namespace chrome 1355 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698