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

chrome/browser/autocomplete/autocomplete_edit_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_edit_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 #include "app/gfx/font.h"
 #include "app/resource_bundle.h"
 #include "base/clipboard.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/cocoa/autocomplete_text_field.h"
+#include "chrome/browser/cocoa/event_utils.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
 // without subclassing NSTextField (even with a subclass, the use of a
 // field editor may complicate things).
 //
 // |model_| doesn't actually do anything when it gains focus, it just
 // initializes.  Visible activity happens only after the user edits.
 // NSTextField delegate receives messages around starting and ending
 // edits, so that sufcices to catch focus changes.  Since all calls
@@ skipping 655 matching lines @@
   if (cmd == @selector(cancelOperation:)) {
     edit_view_->OnEscapeKeyPressed();
     return YES;
   }
 
   // |-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]);
+    WindowOpenDisposition disposition =
+        event_utils::WindowOpenDispositionFromNSEvent(event);
     edit_view_->AcceptInput(disposition, false);
     return YES;
   }
 
   // When the user does Control-Enter, the existing content has "www."
   // prepended and ".com" appended.  |model_| should already have
   // received notification when the Control key was depressed, but it
   // is safe to tell it twice.
   if (cmd == @selector(insertLineBreak:)) {
     edit_view_->OnControlKeyChanged(true);
-    WindowOpenDisposition disposition = event_utils::DispositionFromEventFlags(
-          [[NSApp currentEvent] modifierFlags]);
+    WindowOpenDisposition disposition =
+        event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
     edit_view_->AcceptInput(disposition, false);
     return YES;
   }
 
   // Capture the state before the operation changes the content.
   // TODO(shess): Determine if this is always redundent WRT the call
   // in -controlTextDidChange:.
   edit_view_->OnBeforePossibleChange();
   return NO;
 }
@@ skipping 40 matching lines @@
 // prepended and ".com" appended.  This calls down to
 // AutocompleteEditModel::OnControlKeyChanged() so that it can change
 // the popup to reflect this.  See autocomplete_edit.cc
 // OnControlKeyChanged() and OnAfterPossibleChange().
 - (void)control:(NSControl*)control flagsChanged:(NSEvent*)theEvent {
   BOOL controlFlag = ([theEvent modifierFlags]&NSControlKeyMask) != 0;
   edit_view_->OnControlKeyChanged(controlFlag);
 }
 
 @end