summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-05 14:23:07 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-05 14:23:07 +0000
commit132e0049fc8b4ce19568457b9dd6ad7240bc36fb (patch)
tree59b5c0dbd6296578513db4060ce0b4fdb4c6a2dc
parent201cd21d50c5f2e155ac2654ac9087ae2d403e35 (diff)
downloadchromium_src-132e0049fc8b4ce19568457b9dd6ad7240bc36fb.zip
chromium_src-132e0049fc8b4ce19568457b9dd6ad7240bc36fb.tar.gz
chromium_src-132e0049fc8b4ce19568457b9dd6ad7240bc36fb.tar.bz2
DevTools: open devtools upon F12 on Windows and Mac.
BUG=56375 Review URL: http://codereview.chromium.org/6792049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80450 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/chrome_dll.rc1
-rw-r--r--chrome/browser/ui/gtk/accelerators_gtk.cc1
-rw-r--r--chrome/browser/ui/views/accelerator_table_gtk.cc1
3 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc
index be65dd2..67b4e04 100644
--- a/chrome/app/chrome_dll.rc
+++ b/chrome/app/chrome_dll.rc
@@ -64,6 +64,7 @@ BEGIN
"I", IDC_DEV_TOOLS, VIRTKEY, CONTROL, SHIFT
"J", IDC_DEV_TOOLS_CONSOLE, VIRTKEY, CONTROL, SHIFT
"C", IDC_DEV_TOOLS_INSPECT, VIRTKEY, CONTROL, SHIFT
+ VK_F12, IDC_DEV_TOOLS, VIRTKEY
"N", IDC_NEW_INCOGNITO_WINDOW, VIRTKEY, CONTROL, SHIFT
"T", IDC_NEW_TAB, VIRTKEY, CONTROL
"N", IDC_NEW_WINDOW, VIRTKEY, CONTROL
diff --git a/chrome/browser/ui/gtk/accelerators_gtk.cc b/chrome/browser/ui/gtk/accelerators_gtk.cc
index da1bdb3..bf1edb7 100644
--- a/chrome/browser/ui/gtk/accelerators_gtk.cc
+++ b/chrome/browser/ui/gtk/accelerators_gtk.cc
@@ -133,6 +133,7 @@ const struct AcceleratorMapping {
{ GDK_u, IDC_VIEW_SOURCE, GDK_CONTROL_MASK },
{ GDK_i, IDC_DEV_TOOLS,
GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) },
+ { GDK_F12, IDC_DEV_TOOLS, GdkModifierType(0) },
{ GDK_j, IDC_DEV_TOOLS_CONSOLE,
GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) },
{ GDK_c, IDC_DEV_TOOLS_INSPECT,
diff --git a/chrome/browser/ui/views/accelerator_table_gtk.cc b/chrome/browser/ui/views/accelerator_table_gtk.cc
index 7d94644..733f394 100644
--- a/chrome/browser/ui/views/accelerator_table_gtk.cc
+++ b/chrome/browser/ui/views/accelerator_table_gtk.cc
@@ -88,6 +88,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ ui::VKEY_OEM_2, true, true, false, IDC_HELP_PAGE },
#endif
{ ui::VKEY_I, true, true, false, IDC_DEV_TOOLS },
+ { ui::VKEY_F12 false, false, false, IDC_DEV_TOOLS },
{ ui::VKEY_J, true, true, false, IDC_DEV_TOOLS_CONSOLE },
{ ui::VKEY_C, true, true, false, IDC_DEV_TOOLS_INSPECT },
{ ui::VKEY_N, true, true, false, IDC_NEW_INCOGNITO_WINDOW },