| Index: chrome/browser/ui/cocoa/infobars/infobar_cocoa.mm
|
| diff --git a/chrome/browser/ui/cocoa/infobars/infobar_cocoa.mm b/chrome/browser/ui/cocoa/infobars/infobar_cocoa.mm
|
| index 7ba03e59c1b89435a17e6dc1cc2401de5d5211e5..dd25e546333eb0491b9544cf4c28a2f1a25df0fc 100644
|
| --- a/chrome/browser/ui/cocoa/infobars/infobar_cocoa.mm
|
| +++ b/chrome/browser/ui/cocoa/infobars/infobar_cocoa.mm
|
| @@ -6,15 +6,16 @@
|
|
|
| #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"
|
|
|
| -const int InfoBar::kSeparatorLineHeight = 1;
|
| -const int InfoBar::kDefaultArrowTargetHeight = 11;
|
| -const int InfoBar::kMaximumArrowTargetHeight = 24;
|
| -const int InfoBar::kDefaultArrowTargetHalfWidth = kDefaultArrowTargetHeight;
|
| -const int InfoBar::kMaximumArrowTargetHalfWidth = 14;
|
| -const int InfoBar::kDefaultBarTargetHeight = 36;
|
| +const int infobars::InfoBar::kSeparatorLineHeight = 1;
|
| +const int infobars::InfoBar::kDefaultArrowTargetHeight = 11;
|
| +const int infobars::InfoBar::kMaximumArrowTargetHeight = 24;
|
| +const int infobars::InfoBar::kDefaultArrowTargetHalfWidth =
|
| + kDefaultArrowTargetHeight;
|
| +const int infobars::InfoBar::kMaximumArrowTargetHalfWidth = 14;
|
| +const int infobars::InfoBar::kDefaultBarTargetHeight = 36;
|
|
|
| -InfoBarCocoa::InfoBarCocoa(scoped_ptr<InfoBarDelegate> delegate)
|
| - : InfoBar(delegate.Pass()),
|
| +InfoBarCocoa::InfoBarCocoa(scoped_ptr<infobars::InfoBarDelegate> delegate)
|
| + : infobars::InfoBar(delegate.Pass()),
|
| weak_ptr_factory_(this) {
|
| }
|
|
|
| @@ -23,9 +24,7 @@ InfoBarCocoa::~InfoBarCocoa() {
|
| [controller() infobarWillClose];
|
| }
|
|
|
| -InfoBarManager* InfoBarCocoa::OwnerCocoa() {
|
| - return owner();
|
| -}
|
| +infobars::InfoBarManager* InfoBarCocoa::OwnerCocoa() { return owner(); }
|
|
|
| base::WeakPtr<InfoBarCocoa> InfoBarCocoa::GetWeakPtr() {
|
| return weak_ptr_factory_.GetWeakPtr();
|
|
|