[Mac] Cmd-Return in the omnibox should revert the omnibox text back to its or...

chrome/browser/autocomplete/autocomplete_popup_view_mac.mm

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h"
 
 #include "app/gfx/text_elider.h"
 #include "app/resource_bundle.h"
 #include "base/sys_string_conversions.h"
 #include "base/gfx/rect.h"
@@ skipping 436 matching lines @@
 // everything.  Popup should already be visible.
 void AutocompletePopupViewMac::PaintUpdatesNow() {
   AutocompleteMatrix* matrix = [popup_ contentView];
   [matrix selectCellAtRow:model_->selected_line() column:0];
 }
 
 AutocompletePopupModel* AutocompletePopupViewMac::GetModel() {
   return model_.get();
 }
 
-void AutocompletePopupViewMac::AcceptInput() {
+void AutocompletePopupViewMac::OnClick() {
   const NSInteger selectedRow = [[popup_ contentView] selectedRow];
 
   // -1 means no cells were selected.  This can happen if the user
   // clicked and then dragged their mouse off the popup before
   // releasing, so reset the selection and ignore the event.
   if (selectedRow == -1) {
     PaintUpdatesNow();
   } else {
-    model_->SetSelectedLine(selectedRow, false);
-    WindowOpenDisposition disposition =
-        event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
-    edit_view_->AcceptInput(disposition, false);
+    OpenURLForRow(selectedRow, false);
   }
 }
 
 void AutocompletePopupViewMac::OnMiddleClick() {
-  const NSInteger row = [[popup_ contentView] highlightedRow];
+  OpenURLForRow([[popup_ contentView] highlightedRow], true);
+}
+
+void AutocompletePopupViewMac::OpenURLForRow(int row, bool force_background) {
   if (row == -1) {
     return;
   }
 
+  WindowOpenDisposition disposition = NEW_BACKGROUND_TAB;
+  if (!force_background) {
+    disposition =
+        event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
+  }
+
   // OpenURL() may close the popup, which will clear the result set
   // and, by extension, |match| and its contents.  So copy the
   // relevant strings out to make sure they stay alive until the call
   // completes.
   const AutocompleteMatch& match = model_->result().match_at(row);
   const GURL url(match.destination_url);
   std::wstring keyword;
   const bool is_keyword_hint = model_->GetKeywordForMatch(match, &keyword);
-  edit_view_->OpenURL(url, NEW_BACKGROUND_TAB, match.transition, GURL(), row,
+  edit_view_->OpenURL(url, disposition, match.transition, GURL(), row,
                       is_keyword_hint ? std::wstring() : keyword);
 }
 
 @implementation AutocompleteButtonCell
 
 - init {
   self = [super init];
   if (self) {
     [self setImagePosition:NSImageLeft];
     [self setBordered:NO];
@@ skipping 208 matching lines @@
   return self;
 }
 
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [super dealloc];
 }
 
 - (void)select:(id)sender {
   DCHECK(popup_view_);
-  popup_view_->AcceptInput();
+  popup_view_->OnClick();
 }
 
 - (void)middleSelect:(id)sender {
   DCHECK(popup_view_);
   popup_view_->OnMiddleClick();
 }
 
 @end