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

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: Win compilation fixed Created 8 years, 3 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 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 break; 481 break;
482 482
483 // Show various bits of UI 483 // Show various bits of UI
484 case IDC_OPEN_FILE: 484 case IDC_OPEN_FILE:
485 browser_->OpenFile(); 485 browser_->OpenFile();
486 break; 486 break;
487 case IDC_CREATE_SHORTCUTS: 487 case IDC_CREATE_SHORTCUTS:
488 CreateApplicationShortcuts(browser_); 488 CreateApplicationShortcuts(browser_);
489 break; 489 break;
490 case IDC_DEV_TOOLS: 490 case IDC_DEV_TOOLS:
491 ToggleDevToolsWindow(browser_, DEVTOOLS_TOGGLE_ACTION_NONE); 491 ToggleDevToolsWindow(browser_, DEVTOOLS_TOGGLE_ACTION_SHOW);
492 break; 492 break;
493 case IDC_DEV_TOOLS_CONSOLE: 493 case IDC_DEV_TOOLS_CONSOLE:
494 ToggleDevToolsWindow(browser_, DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE); 494 ToggleDevToolsWindow(browser_, DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE);
495 break; 495 break;
496 case IDC_DEV_TOOLS_INSPECT: 496 case IDC_DEV_TOOLS_INSPECT:
497 ToggleDevToolsWindow(browser_, DEVTOOLS_TOGGLE_ACTION_INSPECT); 497 ToggleDevToolsWindow(browser_, DEVTOOLS_TOGGLE_ACTION_INSPECT);
498 break; 498 break;
499 case IDC_DEV_TOOLS_TOGGLE:
500 ToggleDevToolsWindow(browser_, DEVTOOLS_TOGGLE_ACTION_TOGGLE);
501 break;
499 case IDC_TASK_MANAGER: 502 case IDC_TASK_MANAGER:
500 OpenTaskManager(browser_, false); 503 OpenTaskManager(browser_, false);
501 break; 504 break;
502 case IDC_VIEW_BACKGROUND_PAGES: 505 case IDC_VIEW_BACKGROUND_PAGES:
503 OpenTaskManager(browser_, true); 506 OpenTaskManager(browser_, true);
504 break; 507 break;
505 case IDC_FEEDBACK: 508 case IDC_FEEDBACK:
506 OpenFeedbackDialog(browser_); 509 OpenFeedbackDialog(browser_);
507 break; 510 break;
508 511
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
923 926
924 void BrowserCommandController::UpdateCommandsForDevTools() { 927 void BrowserCommandController::UpdateCommandsForDevTools() {
925 bool dev_tools_enabled = 928 bool dev_tools_enabled =
926 !profile()->GetPrefs()->GetBoolean(prefs::kDevToolsDisabled); 929 !profile()->GetPrefs()->GetBoolean(prefs::kDevToolsDisabled);
927 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS, 930 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS,
928 dev_tools_enabled); 931 dev_tools_enabled);
929 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_CONSOLE, 932 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_CONSOLE,
930 dev_tools_enabled); 933 dev_tools_enabled);
931 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_INSPECT, 934 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_INSPECT,
932 dev_tools_enabled); 935 dev_tools_enabled);
936 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_TOGGLE,
937 dev_tools_enabled);
933 } 938 }
934 939
935 void BrowserCommandController::UpdateCommandsForBookmarkEditing() { 940 void BrowserCommandController::UpdateCommandsForBookmarkEditing() {
936 command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_PAGE, 941 command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_PAGE,
937 CanBookmarkCurrentPage(browser_)); 942 CanBookmarkCurrentPage(browser_));
938 command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_ALL_TABS, 943 command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_ALL_TABS,
939 CanBookmarkAllTabs(browser_)); 944 CanBookmarkAllTabs(browser_));
940 command_updater_.UpdateCommandEnabled(IDC_PIN_TO_START_SCREEN, 945 command_updater_.UpdateCommandEnabled(IDC_PIN_TO_START_SCREEN,
941 true); 946 true);
942 } 947 }
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
1073 1078
1074 BrowserWindow* BrowserCommandController::window() { 1079 BrowserWindow* BrowserCommandController::window() {
1075 return browser_->window(); 1080 return browser_->window();
1076 } 1081 }
1077 1082
1078 Profile* BrowserCommandController::profile() { 1083 Profile* BrowserCommandController::profile() {
1079 return browser_->profile(); 1084 return browser_->profile();
1080 } 1085 }
1081 1086
1082 } // namespace chrome 1087 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc ('k') | chrome/browser/ui/browser_commands.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698