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

chrome/browser/cocoa/infobar_controller.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 <Cocoa/Cocoa.h>
 
 #include "base/logging.h"  // for NOTREACHED()
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
+#include "chrome/browser/cocoa/event_utils.h"
 #include "chrome/browser/cocoa/infobar.h"
 #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"
 
 
 @interface InfoBarController (PrivateMethods)
 // Closes the infobar by calling RemoveDelegate on the container.
 // This will remove the infobar from its associated TabContents as
 // well as trigger the deletion of this InfoBarController.  Once the
 // delegate is removed from the container, it is no longer needed, so
 // we ask it to delete itself.
@@ skipping 145 matching lines @@
 
   // Remove the ok and cancel buttons, since they are not needed.
   [okButton_ removeFromSuperview];
   [cancelButton_ removeFromSuperview];
 }
 
 // Called when someone clicks on the link in the infobar.  This method
 // is called by the InfobarTextField on its delegate (the
 // LinkInfoBarController).
 - (void)linkClicked {
-  WindowOpenDisposition disposition = event_utils::DispositionFromEventFlags(
-      [[NSApp currentEvent] modifierFlags]);
+  WindowOpenDisposition disposition =
+      event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
   if (delegate_->AsLinkInfoBarDelegate()->LinkClicked(disposition))
     [self closeInfoBar];
 }
 
 @end
 
 
 /////////////////////////////////////////////////////////////////////////
 // ConfirmInfoBarController implementation
 
@@ skipping 96 matching lines @@
   LinkInfoBarController* controller =
       [[LinkInfoBarController alloc] initWithDelegate:this];
   return new InfoBar(controller);
 }
 
 InfoBar* ConfirmInfoBarDelegate::CreateInfoBar() {
   ConfirmInfoBarController* controller =
       [[ConfirmInfoBarController alloc] initWithDelegate:this];
   return new InfoBar(controller);
 }