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

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: Comments addressed (AsDevToolsWindow() is necessary, since the DevToolsWindow* result is used in te… 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 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 break; 501 break;
502 502
503 // Show various bits of UI 503 // Show various bits of UI
504 case IDC_OPEN_FILE: 504 case IDC_OPEN_FILE:
505 browser_->OpenFile(); 505 browser_->OpenFile();
506 break; 506 break;
507 case IDC_CREATE_SHORTCUTS: 507 case IDC_CREATE_SHORTCUTS:
508 CreateApplicationShortcuts(browser_); 508 CreateApplicationShortcuts(browser_);
509 break; 509 break;
510 case IDC_DEV_TOOLS: 510 case IDC_DEV_TOOLS:
511 ToggleDevToolsWindow(browser_, DEVTOOLS_TOGGLE_ACTION_NONE); 511 ToggleDevToolsWindow(browser_, DEVTOOLS_TOGGLE_ACTION_SHOW);
512 break; 512 break;
513 case IDC_DEV_TOOLS_CONSOLE: 513 case IDC_DEV_TOOLS_CONSOLE:
514 ToggleDevToolsWindow(browser_, DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE); 514 ToggleDevToolsWindow(browser_, DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE);
515 break; 515 break;
516 case IDC_DEV_TOOLS_INSPECT: 516 case IDC_DEV_TOOLS_INSPECT:
517 ToggleDevToolsWindow(browser_, DEVTOOLS_TOGGLE_ACTION_INSPECT); 517 ToggleDevToolsWindow(browser_, DEVTOOLS_TOGGLE_ACTION_INSPECT);
518 break; 518 break;
519 case IDC_DEV_TOOLS_TOGGLE_INSPECTOR:
520 ToggleDevToolsWindow(browser_, DEVTOOLS_TOGGLE_ACTION_TOGGLE);
521 break;
519 case IDC_TASK_MANAGER: 522 case IDC_TASK_MANAGER:
520 OpenTaskManager(browser_, false); 523 OpenTaskManager(browser_, false);
521 break; 524 break;
522 case IDC_VIEW_BACKGROUND_PAGES: 525 case IDC_VIEW_BACKGROUND_PAGES:
523 OpenTaskManager(browser_, true); 526 OpenTaskManager(browser_, true);
524 break; 527 break;
525 case IDC_FEEDBACK: 528 case IDC_FEEDBACK:
526 OpenFeedbackDialog(browser_); 529 OpenFeedbackDialog(browser_);
527 break; 530 break;
528 531
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
945 948
946 void BrowserCommandController::UpdateCommandsForDevTools() { 949 void BrowserCommandController::UpdateCommandsForDevTools() {
947 bool dev_tools_enabled = 950 bool dev_tools_enabled =
948 !profile()->GetPrefs()->GetBoolean(prefs::kDevToolsDisabled); 951 !profile()->GetPrefs()->GetBoolean(prefs::kDevToolsDisabled);
949 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS, 952 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS,
950 dev_tools_enabled); 953 dev_tools_enabled);
951 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_CONSOLE, 954 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_CONSOLE,
952 dev_tools_enabled); 955 dev_tools_enabled);
953 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_INSPECT, 956 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_INSPECT,
954 dev_tools_enabled); 957 dev_tools_enabled);
958 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_TOGGLE_INSPECTOR,
pfeldman 2012/08/24 10:16:14 _TOGGLE ? (Drop INSPECTOR)
apavlov 2012/08/24 11:02:13 Done.
959 dev_tools_enabled);
955 } 960 }
956 961
957 void BrowserCommandController::UpdateCommandsForBookmarkEditing() { 962 void BrowserCommandController::UpdateCommandsForBookmarkEditing() {
958 command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_PAGE, 963 command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_PAGE,
959 CanBookmarkCurrentPage(browser_)); 964 CanBookmarkCurrentPage(browser_));
960 command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_ALL_TABS, 965 command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_ALL_TABS,
961 CanBookmarkAllTabs(browser_)); 966 CanBookmarkAllTabs(browser_));
962 command_updater_.UpdateCommandEnabled(IDC_PIN_TO_START_SCREEN, 967 command_updater_.UpdateCommandEnabled(IDC_PIN_TO_START_SCREEN,
963 true); 968 true);
964 } 969 }
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
1104 bool BrowserCommandController::IsFullScreenWindowOpen() { 1109 bool BrowserCommandController::IsFullScreenWindowOpen() {
1105 #if defined(USE_ASH) 1110 #if defined(USE_ASH)
1106 aura::Window* window = ash::wm::GetActiveWindow(); 1111 aura::Window* window = ash::wm::GetActiveWindow();
1107 return (window && ash::wm::IsWindowFullscreen(window)); 1112 return (window && ash::wm::IsWindowFullscreen(window));
1108 #else 1113 #else
1109 return false; 1114 return false;
1110 #endif 1115 #endif
1111 } 1116 }
1112 1117
1113 } // namespace chrome 1118 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698