Upstream version 7.36.149.0

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

diff --git a/src/chrome/browser/ui/cocoa/infobars/infobar_cocoa.mm b/src/chrome/browser/ui/cocoa/infobars/infobar_cocoa.mm
index b49579c..dd25e54 100644 (file)
--- a/src/chrome/browser/ui/cocoa/infobars/infobar_cocoa.mm
+++ b/src/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];
 }
 
-InfoBarService* InfoBarCocoa::OwnerCocoa() {
-  return owner();
-}
+infobars::InfoBarManager* InfoBarCocoa::OwnerCocoa() { return owner(); }
 
 base::WeakPtr<InfoBarCocoa> InfoBarCocoa::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();