Upstream version 10.39.225.0

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

diff --git a/src/chrome/browser/ui/cocoa/infobars/infobar_controller.mm b/src/chrome/browser/ui/cocoa/infobars/infobar_controller.mm
index 80cc4a2..5137178 100644 (file)
--- a/src/chrome/browser/ui/cocoa/infobars/infobar_controller.mm
+++ b/src/chrome/browser/ui/cocoa/infobars/infobar_controller.mm
@@ -10,7 +10,6 @@
 #include "chrome/browser/infobars/infobar_service.h"
 #import "chrome/browser/ui/cocoa/animatable_view.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
-#import "chrome/browser/ui/cocoa/hyperlink_text_view.h"
 #import "chrome/browser/ui/cocoa/image_button_cell.h"
 #include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_cocoa.h"
@@ -18,8 +17,9 @@
 #import "chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #include "grit/theme_resources.h"
-#include "grit/ui_resources.h"
+#import "ui/base/cocoa/controls/hyperlink_text_view.h"
 #include "ui/gfx/image/image.h"
+#include "ui/resources/grit/ui_resources.h"
 
 @interface InfoBarController ()
 // Sets |label_| based on |labelPlaceholder_|, sets |labelPlaceholder_| to nil.
@@ -69,6 +69,7 @@
   [self addAdditionalControls];
 
   [infoBarView_ setInfobarType:[self delegate]->GetInfoBarType()];
+  [infoBarView_ setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
 }
 
 - (void)dealloc {