| Index: chrome/browser/ui/cocoa/infobars/infobar_gradient_view.mm
|
| diff --git a/chrome/browser/ui/cocoa/infobars/infobar_gradient_view.mm b/chrome/browser/ui/cocoa/infobars/infobar_gradient_view.mm
|
| index 4b0c70ba192be8fbe30ca13d9b5ac98c42ea7556..e96d5674c9c7c7270fe6c6f39dbbb9cb94ced9c4 100644
|
| --- a/chrome/browser/ui/cocoa/infobars/infobar_gradient_view.mm
|
| +++ b/chrome/browser/ui/cocoa/infobars/infobar_gradient_view.mm
|
| @@ -5,13 +5,13 @@
|
| #include "chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h"
|
|
|
| #include "base/mac/scoped_nsobject.h"
|
| -#include "chrome/browser/infobars/infobar.h"
|
| #import "chrome/browser/themes/theme_properties.h"
|
| #import "chrome/browser/ui/cocoa/browser_window_controller.h"
|
| #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
|
| #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
|
| #import "chrome/browser/ui/cocoa/nsview_additions.h"
|
| #import "chrome/browser/ui/cocoa/themed_window.h"
|
| +#include "components/infobars/core/infobar.h"
|
| #include "skia/ext/skia_utils_mac.h"
|
| #include "ui/base/theme_provider.h"
|
|
|
| @@ -36,9 +36,9 @@
|
| return self;
|
| }
|
|
|
| -- (void)setInfobarType:(InfoBarDelegate::Type)infobarType {
|
| - SkColor topColor = InfoBar::GetTopColor(infobarType);
|
| - SkColor bottomColor = InfoBar::GetBottomColor(infobarType);
|
| +- (void)setInfobarType:(infobars::InfoBarDelegate::Type)infobarType {
|
| + SkColor topColor = infobars::InfoBar::GetTopColor(infobarType);
|
| + SkColor bottomColor = infobars::InfoBar::GetBottomColor(infobarType);
|
| base::scoped_nsobject<NSGradient> gradient([[NSGradient alloc]
|
| initWithStartingColor:gfx::SkColorToCalibratedNSColor(topColor)
|
| endingColor:gfx::SkColorToCalibratedNSColor(bottomColor)]);
|
| @@ -58,7 +58,7 @@
|
|
|
| - (void)drawRect:(NSRect)rect {
|
| NSRect bounds = [self bounds];
|
| - bounds.size.height = InfoBar::kDefaultBarTargetHeight;
|
| + bounds.size.height = infobars::InfoBar::kDefaultBarTargetHeight;
|
|
|
| CGFloat tipXOffset = arrowX_ - arrowHalfWidth_;
|
|
|
|
|