Add modifier key support for window open dispositions throught the Mac UI

* Add cocoa_utils.{h,mm} and a unit test for the one method it contains:
  event_utils::DispositionFromEventFlags().
* Add modifier key support to the history menu, bookmark menu, infobars,
  bookmark bar, and Omnibox.

BUG=17912,17301
TEST=When using the aforementioned UI elements, Cmd should open in new
foreground tab, Cmd+Shift should open in new background tab, and Shift should
open in a new window.

Patch by Robert Sesek.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23636 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 41 insertions, 13 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
index 2de70d1..9ba16ef 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/autocomplete/autocomplete_edit_view_mac.h"
 
+#include <Carbon/Carbon.h>  // kVK_Return
 #include "app/gfx/font.h"
 #include "app/resource_bundle.h"
 #include "base/clipboard.h"
@@ -15,6 +16,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/cocoa/autocomplete_text_field.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#import "chrome/common/cocoa_utils.h"
 
 // Focus-handling between |field_| and |model_| is a bit subtle.
 // Other platforms detect change of focus, which is inconvenient
@@ -685,8 +687,14 @@ std::wstring AutocompleteEditViewMac::GetClipboardText(Clipboard* clipboard) {
     return YES;
   }
 
-  if (cmd == @selector(insertNewline:)) {
-    edit_view_->AcceptInput(CURRENT_TAB, false);
+  // |-noop:| is sent when the user presses Cmd+Return. Override the no-op
+  // behavior with the proper WindowOpenDisposition.
+  NSEvent* event = [NSApp currentEvent];
+  if (cmd == @selector(insertNewline:) ||
+     (cmd == @selector(noop:) && [event keyCode] == kVK_Return)) {
+    WindowOpenDisposition disposition = event_utils::DispositionFromEventFlags(
+        [event modifierFlags]);
+    edit_view_->AcceptInput(disposition, false);
     return YES;
   }
 
@@ -696,7 +704,9 @@ std::wstring AutocompleteEditViewMac::GetClipboardText(Clipboard* clipboard) {
   // is safe to tell it twice.
   if (cmd == @selector(insertLineBreak:)) {
     edit_view_->OnControlKeyChanged(true);
-    edit_view_->AcceptInput(CURRENT_TAB, false);
+    WindowOpenDisposition disposition = event_utils::DispositionFromEventFlags(
+          [[NSApp currentEvent] modifierFlags]);
+    edit_view_->AcceptInput(disposition, false);
     return YES;
   }
 
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
index 2489c5a..1d54c9e 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
@@ -9,6 +9,7 @@
 #include "chrome/browser/autocomplete/autocomplete_edit_view_mac.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/cocoa/nsimage_cache.h"
+#import "chrome/common/cocoa_utils.h"
 
 namespace {
 
@@ -379,7 +380,9 @@ void AutocompletePopupViewMac::AcceptInput() {
     PaintUpdatesNow();
   } else {
     model_->SetSelectedLine(selectedRow, false);
-    edit_view_->AcceptInput(CURRENT_TAB, false);
+    WindowOpenDisposition disposition = event_utils::DispositionFromEventFlags(
+          [[NSApp currentEvent] modifierFlags]);
+    edit_view_->AcceptInput(disposition, false);
   }
 }
 
diff --git a/chrome/browser/cocoa/bookmark_bar_controller.mm b/chrome/browser/cocoa/bookmark_bar_controller.mm
index ebba2f3..5d25b67 100644
--- a/chrome/browser/cocoa/bookmark_bar_controller.mm
+++ b/chrome/browser/cocoa/bookmark_bar_controller.mm
@@ -17,6 +17,7 @@
 #import "chrome/browser/cocoa/view_resizer.h"
 #include "chrome/browser/cocoa/nsimage_cache.h"
 #include "chrome/browser/profile.h"
+#import "chrome/common/cocoa_utils.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "skia/ext/skia_utils_mac.h"
@@ -185,7 +186,9 @@ const CGFloat kBookmarkHorizontalPadding = 1.0;
 
 - (IBAction)openBookmark:(id)sender {
   BookmarkNode* node = [self nodeFromButton:sender];
-  [urlDelegate_ openBookmarkURL:node->GetURL() disposition:CURRENT_TAB];
+  WindowOpenDisposition disposition = event_utils::DispositionFromEventFlags(
+      [[NSApp currentEvent] modifierFlags]);
+  [urlDelegate_ openBookmarkURL:node->GetURL() disposition:disposition];
 }
 
 // Given a NSMenuItem tag, return the appropriate bookmark node id.
@@ -498,7 +501,9 @@ const CGFloat kBookmarkHorizontalPadding = 1.0;
 - (IBAction)openBookmarkMenuItem:(id)sender {
   int64 tag = [self nodeIdFromMenuTag:[sender tag]];
   const BookmarkNode* node = bookmarkModel_->GetNodeByID(tag);
-  [urlDelegate_ openBookmarkURL:node->GetURL() disposition:CURRENT_TAB];
+  WindowOpenDisposition disposition = event_utils::DispositionFromEventFlags(
+      [[NSApp currentEvent] modifierFlags]);
+  [urlDelegate_ openBookmarkURL:node->GetURL() disposition:disposition];
 }
 
 // Add all items from the given model to our bookmark bar.
diff --git a/chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm b/chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm
index 46f17bf..7d3df67 100644
--- a/chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm
+++ b/chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm
@@ -10,7 +10,8 @@
 #import "chrome/browser/cocoa/bookmark_menu_cocoa_controller.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "webkit/glue/window_open_disposition.h"  // CURRENT_TAB
+#import "chrome/common/cocoa_utils.h"
+#include "webkit/glue/window_open_disposition.h"
 
 namespace {
 
@@ -60,7 +61,9 @@ const NSUInteger kMaximumMenuPixelsWide = 300;
   DCHECK(tab_contents);
 
   // A TabContents is a PageNavigator, so we can OpenURL() on it.
-  tab_contents->OpenURL(node->GetURL(), GURL(), CURRENT_TAB,
+  WindowOpenDisposition disposition = event_utils::DispositionFromEventFlags(
+      [[NSApp currentEvent] modifierFlags]);
+  tab_contents->OpenURL(node->GetURL(), GURL(), disposition,
                         PageTransition::AUTO_BOOKMARK);
 }
 
diff --git a/chrome/browser/cocoa/history_menu_cocoa_controller.mm b/chrome/browser/cocoa/history_menu_cocoa_controller.mm
index ac69916..b6523ab 100644
--- a/chrome/browser/cocoa/history_menu_cocoa_controller.mm
+++ b/chrome/browser/cocoa/history_menu_cocoa_controller.mm
@@ -10,7 +10,8 @@
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "webkit/glue/window_open_disposition.h"  // CURRENT_TAB
+#import "chrome/common/cocoa_utils.h"
+#include "webkit/glue/window_open_disposition.h"
 
 @implementation HistoryMenuCocoaController
 
@@ -35,7 +36,9 @@
   DCHECK(tab_contents);
 
   // A TabContents is a PageNavigator, so we can OpenURL() on it.
-  tab_contents->OpenURL(node.url, GURL(), CURRENT_TAB,
+  WindowOpenDisposition disposition = event_utils::DispositionFromEventFlags(
+      [[NSApp currentEvent] modifierFlags]);
+  tab_contents->OpenURL(node.url, GURL(), disposition,
                         PageTransition::AUTO_BOOKMARK);
 }
 
diff --git a/chrome/browser/cocoa/infobar_controller.mm b/chrome/browser/cocoa/infobar_controller.mm
index f887cf8..ea496de 100644
--- a/chrome/browser/cocoa/infobar_controller.mm
+++ b/chrome/browser/cocoa/infobar_controller.mm
@@ -11,6 +11,7 @@
 #import "chrome/browser/cocoa/infobar_container_controller.h"
 #import "chrome/browser/cocoa/infobar_controller.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#import "chrome/common/cocoa_utils.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "webkit/glue/window_open_disposition.h"
 
@@ -176,8 +177,8 @@
 // is called by the InfobarTextField on its delegate (the
 // LinkInfoBarController).
 - (void)linkClicked {
-  // TODO(rohitrao): Set the disposition correctly based on modifier keys.
-  WindowOpenDisposition disposition = CURRENT_TAB;
+  WindowOpenDisposition disposition = event_utils::DispositionFromEventFlags(
+      [[NSApp currentEvent] modifierFlags]);
   if (delegate_->AsLinkInfoBarDelegate()->LinkClicked(disposition))
     [self closeInfoBar];
 }
diff --git a/chrome/browser/cocoa/location_bar_view_mac.mm b/chrome/browser/cocoa/location_bar_view_mac.mm
index edbd4a5..bdb7c1b 100644
--- a/chrome/browser/cocoa/location_bar_view_mac.mm
+++ b/chrome/browser/cocoa/location_bar_view_mac.mm
@@ -10,6 +10,7 @@
 #import "chrome/browser/app_controller_mac.h"
 #import "chrome/browser/autocomplete/autocomplete_edit_view_mac.h"
 #include "chrome/browser/command_updater.h"
+#import "chrome/common/cocoa_utils.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 // TODO(shess): This code is mostly copied from the gtk
@@ -48,7 +49,9 @@ PageTransition::Type LocationBarViewMac::GetPageTransition() const {
 }
 
 void LocationBarViewMac::AcceptInput() {
-  AcceptInputWithDisposition(CURRENT_TAB);
+  WindowOpenDisposition disposition = event_utils::DispositionFromEventFlags(
+      [[NSApp currentEvent] modifierFlags]);
+  AcceptInputWithDisposition(disposition);
 }
 
 void LocationBarViewMac::AcceptInputWithDisposition(