diff options
| author | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-01 17:06:13 +0000 |
|---|---|---|
| committer | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-01 17:06:13 +0000 |
| commit | 2e397e90870202c0dc96fc426b6de5b34c4e6c7f (patch) | |
| tree | 8b1c1752e8926f3ea519e37f40f62c98861392d8 | |
| parent | 3a980ea2a29aeb7296dfe7bf91a1af4702cbbe05 (diff) | |
| download | chromium_src-2e397e90870202c0dc96fc426b6de5b34c4e6c7f.zip chromium_src-2e397e90870202c0dc96fc426b6de5b34c4e6c7f.tar.gz chromium_src-2e397e90870202c0dc96fc426b6de5b34c4e6c7f.tar.bz2 | |
Switch the new tab key to command on the Mac. Popping new tabs still doesn't work, but this is a step.
BUG=9417
Review URL: http://codereview.chromium.org/56150
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12956 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/glue/webframeloaderclient_impl.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc index 3ba3057..265f82e 100644 --- a/webkit/glue/webframeloaderclient_impl.cc +++ b/webkit/glue/webframeloaderclient_impl.cc @@ -1563,14 +1563,18 @@ bool WebFrameLoaderClient::ActionSpecifiesDisposition( return false; const MouseEvent* event = static_cast<const MouseEvent*>(action.event()); - const bool middle_or_ctrl = (event->button() == 1) || event->ctrlKey(); +#if defined(OS_WIN) || defined(OS_LINUX) + const bool new_tab_modifier = (event->button() == 1) || event->ctrlKey(); +#elif defined(OS_MACOSX) + const bool new_tab_modifier = (event->button() == 1) || event->metaKey(); +#endif const bool shift = event->shiftKey(); const bool alt = event->altKey(); - if (!middle_or_ctrl && !shift && !alt) + if (!new_tab_modifier && !shift && !alt) return false; DCHECK(disposition); - if (middle_or_ctrl) + if (new_tab_modifier) *disposition = shift ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB; else *disposition = shift ? NEW_WINDOW : SAVE_TO_DISK; |