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

Side by Side Diff: chrome/browser/ui/browser_commands.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_commands.h" 5 #include "chrome/browser/ui/browser_commands.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/bookmarks/bookmark_editor.h" 10 #include "chrome/browser/bookmarks/bookmark_editor.h"
(...skipping 785 matching lines...) Expand 10 before | Expand all | Expand 10 after
796 void FocusPreviousPane(Browser* browser) { 796 void FocusPreviousPane(Browser* browser) {
797 content::RecordAction(UserMetricsAction("FocusPreviousPane")); 797 content::RecordAction(UserMetricsAction("FocusPreviousPane"));
798 browser->window()->RotatePaneFocus(false); 798 browser->window()->RotatePaneFocus(false);
799 } 799 }
800 800
801 void ToggleDevToolsWindow(Browser* browser, DevToolsToggleAction action) { 801 void ToggleDevToolsWindow(Browser* browser, DevToolsToggleAction action) {
802 if (action == DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE) 802 if (action == DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE)
803 content::RecordAction(UserMetricsAction("DevTools_ToggleConsole")); 803 content::RecordAction(UserMetricsAction("DevTools_ToggleConsole"));
804 else 804 else
805 content::RecordAction(UserMetricsAction("DevTools_ToggleWindow")); 805 content::RecordAction(UserMetricsAction("DevTools_ToggleWindow"));
806 806 DevToolsWindow::ToggleDevToolsWindow(browser, action);
807 DevToolsWindow::ToggleDevToolsWindow(
808 GetActiveWebContents(browser)->GetRenderViewHost(),
809 action);
810 } 807 }
811 808
812 bool CanOpenTaskManager() { 809 bool CanOpenTaskManager() {
813 #if defined(OS_WIN) 810 #if defined(OS_WIN)
814 // In metro we can't display the task manager, as it is a native window. 811 // In metro we can't display the task manager, as it is a native window.
815 return !base::win::IsMetroProcess(); 812 return !base::win::IsMetroProcess();
816 #else 813 #else
817 return true; 814 return true;
818 #endif 815 #endif
819 } 816 }
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
979 if (!tab_contents) 976 if (!tab_contents)
980 tab_contents = new TabContents(contents); 977 tab_contents = new TabContents(contents);
981 app_browser->tab_strip_model()->AppendTabContents(tab_contents, true); 978 app_browser->tab_strip_model()->AppendTabContents(tab_contents, true);
982 979
983 contents->GetMutableRendererPrefs()->can_accept_load_drops = false; 980 contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
984 contents->GetRenderViewHost()->SyncRendererPrefs(); 981 contents->GetRenderViewHost()->SyncRendererPrefs();
985 app_browser->window()->Show(); 982 app_browser->window()->Show();
986 } 983 }
987 984
988 } // namespace chrome 985 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698