This changelist represents the necessary merger of two others:...

chrome/browser/cocoa/location_bar_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.
 
 #import "chrome/browser/cocoa/location_bar_view_mac.h"
 
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/alternate_nav_url_fetcher.h"
 #import "chrome/browser/app_controller_mac.h"
 #import "chrome/browser/autocomplete/autocomplete_edit_view_mac.h"
+#include "chrome/browser/cocoa/event_utils.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
 // implementation.  Make sure it's all appropriate and flesh it out.
 
 LocationBarViewMac::LocationBarViewMac(AutocompleteTextField* field,
                                        CommandUpdater* command_updater,
                                        ToolbarModel* toolbar_model,
                                        Profile* profile)
   : edit_view_(new AutocompleteEditViewMac(this, toolbar_model, profile,
@@ skipping 18 matching lines @@
 // TODO(shess): Verify that this TODO is TODONE.
 // TODO(rohitrao): Fix this to return different types once autocomplete and
 // the onmibar are implemented.  For now, any URL that comes from the
 // LocationBar has to have been entered by the user, and thus is of type
 // PageTransition::TYPED.
 PageTransition::Type LocationBarViewMac::GetPageTransition() const {
   return transition_;
 }
 
 void LocationBarViewMac::AcceptInput() {
-  WindowOpenDisposition disposition = event_utils::DispositionFromEventFlags(
-      [[NSApp currentEvent] modifierFlags]);
+  WindowOpenDisposition disposition =
+      event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
   AcceptInputWithDisposition(disposition);
 }
 
 void LocationBarViewMac::AcceptInputWithDisposition(
     WindowOpenDisposition disposition) {
   edit_view_->AcceptInput(disposition, false);
 }
 
 void LocationBarViewMac::FocusLocation() {
   edit_view_->FocusLocation();
@@ skipping 69 matching lines @@
 }
 
 void LocationBarViewMac::Revert() {
   edit_view_->RevertAll();
 }
 
 int LocationBarViewMac::PageActionVisibleCount() {
   NOTIMPLEMENTED();
   return -1;
 }