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

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

Issue 10823233: Close detached DevTools window (rather than open a new instance) when it receives an F12 keypress (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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/browser_command_controller.h" 5 #include "chrome/browser/ui/browser_command_controller.h"
6 6
7 #include "chrome/app/chrome_command_ids.h" 7 #include "chrome/app/chrome_command_ids.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/defaults.h" 9 #include "chrome/browser/defaults.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 break; 486 break;
487 case IDC_DEV_TOOLS: 487 case IDC_DEV_TOOLS:
488 ToggleDevToolsWindow(browser_, DEVTOOLS_TOGGLE_ACTION_NONE); 488 ToggleDevToolsWindow(browser_, DEVTOOLS_TOGGLE_ACTION_NONE);
489 break; 489 break;
490 case IDC_DEV_TOOLS_CONSOLE: 490 case IDC_DEV_TOOLS_CONSOLE:
491 ToggleDevToolsWindow(browser_, DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE); 491 ToggleDevToolsWindow(browser_, DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE);
492 break; 492 break;
493 case IDC_DEV_TOOLS_INSPECT: 493 case IDC_DEV_TOOLS_INSPECT:
494 ToggleDevToolsWindow(browser_, DEVTOOLS_TOGGLE_ACTION_INSPECT); 494 ToggleDevToolsWindow(browser_, DEVTOOLS_TOGGLE_ACTION_INSPECT);
495 break; 495 break;
496 case IDC_DEV_TOOLS_TOGGLE_INSPECTOR:
497 ToggleDevToolsWindow(browser_, DEVTOOLS_TOGGLE_ACTION_TOGGLE_INSPECTOR);
498 break;
496 case IDC_TASK_MANAGER: 499 case IDC_TASK_MANAGER:
497 OpenTaskManager(browser_, false); 500 OpenTaskManager(browser_, false);
498 break; 501 break;
499 case IDC_VIEW_BACKGROUND_PAGES: 502 case IDC_VIEW_BACKGROUND_PAGES:
500 OpenTaskManager(browser_, true); 503 OpenTaskManager(browser_, true);
501 break; 504 break;
502 case IDC_FEEDBACK: 505 case IDC_FEEDBACK:
503 OpenFeedbackDialog(browser_); 506 OpenFeedbackDialog(browser_);
504 break; 507 break;
505 508
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
922 925
923 void BrowserCommandController::UpdateCommandsForDevTools() { 926 void BrowserCommandController::UpdateCommandsForDevTools() {
924 bool dev_tools_enabled = 927 bool dev_tools_enabled =
925 !profile()->GetPrefs()->GetBoolean(prefs::kDevToolsDisabled); 928 !profile()->GetPrefs()->GetBoolean(prefs::kDevToolsDisabled);
926 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS, 929 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS,
927 dev_tools_enabled); 930 dev_tools_enabled);
928 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_CONSOLE, 931 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_CONSOLE,
929 dev_tools_enabled); 932 dev_tools_enabled);
930 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_INSPECT, 933 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_INSPECT,
931 dev_tools_enabled); 934 dev_tools_enabled);
935 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_TOGGLE_INSPECTOR,
936 dev_tools_enabled);
932 } 937 }
933 938
934 void BrowserCommandController::UpdateCommandsForBookmarkEditing() { 939 void BrowserCommandController::UpdateCommandsForBookmarkEditing() {
935 command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_PAGE, 940 command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_PAGE,
936 CanBookmarkCurrentPage(browser_)); 941 CanBookmarkCurrentPage(browser_));
937 command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_ALL_TABS, 942 command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_ALL_TABS,
938 CanBookmarkAllTabs(browser_)); 943 CanBookmarkAllTabs(browser_));
939 command_updater_.UpdateCommandEnabled(IDC_PIN_TO_START_SCREEN, 944 command_updater_.UpdateCommandEnabled(IDC_PIN_TO_START_SCREEN,
940 true); 945 true);
941 } 946 }
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
1072 1077
1073 BrowserWindow* BrowserCommandController::window() { 1078 BrowserWindow* BrowserCommandController::window() {
1074 return browser_->window(); 1079 return browser_->window();
1075 } 1080 }
1076 1081
1077 Profile* BrowserCommandController::profile() { 1082 Profile* BrowserCommandController::profile() {
1078 return browser_->profile(); 1083 return browser_->profile();
1079 } 1084 }
1080 1085
1081 } // namespace chrome 1086 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698