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

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: Return NULL as the ToggleDevToolsWindow() result for DevTools windows 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 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 break; 478 break;
479 479
480 // Show various bits of UI 480 // Show various bits of UI
481 case IDC_OPEN_FILE: 481 case IDC_OPEN_FILE:
482 browser_->OpenFile(); 482 browser_->OpenFile();
483 break; 483 break;
484 case IDC_CREATE_SHORTCUTS: 484 case IDC_CREATE_SHORTCUTS:
485 CreateApplicationShortcuts(browser_); 485 CreateApplicationShortcuts(browser_);
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_SHOW);
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:
497 ToggleDevToolsWindow(browser_, DEVTOOLS_TOGGLE_ACTION_TOGGLE);
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 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
919 922
920 void BrowserCommandController::UpdateCommandsForDevTools() { 923 void BrowserCommandController::UpdateCommandsForDevTools() {
921 bool dev_tools_enabled = 924 bool dev_tools_enabled =
922 !profile()->GetPrefs()->GetBoolean(prefs::kDevToolsDisabled); 925 !profile()->GetPrefs()->GetBoolean(prefs::kDevToolsDisabled);
923 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS, 926 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS,
924 dev_tools_enabled); 927 dev_tools_enabled);
925 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_CONSOLE, 928 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_CONSOLE,
926 dev_tools_enabled); 929 dev_tools_enabled);
927 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_INSPECT, 930 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_INSPECT,
928 dev_tools_enabled); 931 dev_tools_enabled);
932 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_TOGGLE,
933 dev_tools_enabled);
929 } 934 }
930 935
931 void BrowserCommandController::UpdateCommandsForBookmarkEditing() { 936 void BrowserCommandController::UpdateCommandsForBookmarkEditing() {
932 command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_PAGE, 937 command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_PAGE,
933 CanBookmarkCurrentPage(browser_)); 938 CanBookmarkCurrentPage(browser_));
934 command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_ALL_TABS, 939 command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_ALL_TABS,
935 CanBookmarkAllTabs(browser_)); 940 CanBookmarkAllTabs(browser_));
936 command_updater_.UpdateCommandEnabled(IDC_PIN_TO_START_SCREEN, 941 command_updater_.UpdateCommandEnabled(IDC_PIN_TO_START_SCREEN,
937 true); 942 true);
938 } 943 }
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
1069 1074
1070 BrowserWindow* BrowserCommandController::window() { 1075 BrowserWindow* BrowserCommandController::window() {
1071 return browser_->window(); 1076 return browser_->window();
1072 } 1077 }
1073 1078
1074 Profile* BrowserCommandController::profile() { 1079 Profile* BrowserCommandController::profile() {
1075 return browser_->profile(); 1080 return browser_->profile();
1076 } 1081 }
1077 1082
1078 } // namespace chrome 1083 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698