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

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 "base/sys_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view_mac.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
+#include "chrome/browser/cocoa/event_utils.h"
 #include "chrome/browser/cocoa/nsimage_cache.h"
-#import "chrome/common/cocoa_utils.h"
 
 namespace {
 
 // The size delta between the font used for the edit and the result
 // rows.
 const int kEditFontAdjust = -1;
 
 // How much to adjust the cell sizing up from the default determined
 // by the font.
 const int kCellHeightAdjust = 7.0;
@@ skipping 238 matching lines @@
     [popup_ setLevel:NSNormalWindowLevel];
 
     AutocompleteMatrix* matrix =
         [[[AutocompleteMatrix alloc] initWithFrame:NSZeroRect] autorelease];
     [matrix setTarget:matrix_target_];
     [matrix setAction:@selector(select:)];
     [popup_ setContentView:matrix];
 
     // We need the popup to follow window resize.
     NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
-    [nc addObserver:matrix_target_ 
-           selector:@selector(windowDidResize:) 
-               name:NSWindowDidResizeNotification 
+    [nc addObserver:matrix_target_
+           selector:@selector(windowDidResize:)
+               name:NSWindowDidResizeNotification
              object:[field_ window]];
   }
 }
 
 void AutocompletePopupViewMac::UpdatePopupAppearance() {
   const AutocompleteResult& result = model_->result();
   if (result.empty()) {
     [[popup_ parentWindow] removeChildWindow:popup_];
     [popup_ orderOut:nil];
 
     // Break references to matrix_target_ before releasing popup_.
     NSMatrix* matrix = [popup_ contentView];
     [matrix setTarget:nil];
 
     NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
     [nc removeObserver:matrix_target_
-                  name:NSWindowDidResizeNotification 
+                  name:NSWindowDidResizeNotification
                 object:[field_ window]];
 
     popup_.reset(nil);
 
     return;
   }
 
   CreatePopupIfNeeded();
 
   // The popup's font is a slightly smaller version of what |field_|
@@ skipping 72 matching lines @@
 void AutocompletePopupViewMac::AcceptInput() {
   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::DispositionFromEventFlags(
-          [[NSApp currentEvent] modifierFlags]);
+    WindowOpenDisposition disposition =
+        event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
     edit_view_->AcceptInput(disposition, false);
   }
 }
 
 @implementation AutocompleteButtonCell
 
 - init {
   self = [super init];
   if (self) {
     [self setImagePosition:NSImageLeft];
@@ skipping 184 matching lines @@
   DCHECK(popup_view_);
 
   // TODO(shess): UpdatePopupAppearance() is called frequently, so it
   // should be really cheap, but in this case we could probably make
   // things even cheaper by refactoring between the popup-placement
   // code and the matrix-population code.
   popup_view_->UpdatePopupAppearance();
 }
 
 @end