Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / cocoa / infobars / confirm_infobar_controller.mm

diff --git a/src/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller.mm b/src/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller.mm
index 951c4b8..405305b 100644 (file)
--- a/src/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller.mm
+++ b/src/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller.mm
@@ -6,11 +6,11 @@
 
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
-#include "chrome/browser/infobars/confirm_infobar_delegate.h"
-#import "chrome/browser/ui/cocoa/hyperlink_text_view.h"
 #include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"
+#include "components/infobars/core/confirm_infobar_delegate.h"
 #include "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"
-#import "ui/base/cocoa/cocoa_event_utils.h"
+#import "ui/base/cocoa/cocoa_base_utils.h"
+#import "ui/base/cocoa/controls/hyperlink_text_view.h"
 #include "ui/base/window_open_disposition.h"
 
 @implementation ConfirmInfoBarController
@@ -138,12 +138,12 @@
 @end
 
 // static
-scoped_ptr<InfoBar> ConfirmInfoBarDelegate::CreateInfoBar(
+scoped_ptr<infobars::InfoBar> ConfirmInfoBarDelegate::CreateInfoBar(
     scoped_ptr<ConfirmInfoBarDelegate> delegate) {
   scoped_ptr<InfoBarCocoa> infobar(
-      new InfoBarCocoa(delegate.PassAs<InfoBarDelegate>()));
+      new InfoBarCocoa(delegate.PassAs<infobars::InfoBarDelegate>()));
   base::scoped_nsobject<ConfirmInfoBarController> controller(
       [[ConfirmInfoBarController alloc] initWithInfoBar:infobar.get()]);
   infobar->set_controller(controller);
-  return infobar.PassAs<InfoBar>();
+  return infobar.PassAs<infobars::InfoBar>();
 }