Mac InfoBar: Use cross platform infobar classes

chrome/browser/infobars/infobar.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_INFOBARS_INFOBAR_H_
 #define CHROME_BROWSER_INFOBARS_INFOBAR_H_
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "build/build_config.h"
 #include "chrome/browser/infobars/infobar_delegate.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/gfx/size.h"
 
 // TODO(sail): These functions should be static methods in the InfoBar class
 // below once all platforms use that class.
 SkColor GetInfoBarTopColor(InfoBarDelegate::Type infobar_type);
 SkColor GetInfoBarBottomColor(InfoBarDelegate::Type infobar_type);
 
 // TODO(pkasting): Same with these notification-related typedefs.
 typedef InfoBarDelegate InfoBarAddedDetails;
 typedef std::pair<InfoBarDelegate*, bool> InfoBarRemovedDetails;
 typedef std::pair<InfoBarDelegate*, InfoBarDelegate*> InfoBarReplacedDetails;
 
-// TODO(pkasting): Port Mac to use this.
-#if defined(TOOLKIT_VIEWS) || defined(TOOLKIT_GTK) || defined(OS_ANDROID)
-
 class InfoBarContainer;
 class InfoBarService;
 
 class InfoBar : public ui::AnimationDelegate {
  public:
   InfoBar(InfoBarService* owner, InfoBarDelegate* delegate);
   virtual ~InfoBar();
 
   // Platforms must define these.
   static const int kDefaultBarTargetHeight;
@@ skipping 18 matching lines @@
   void Hide(bool animate);
 
   // Changes the target height of the arrow portion of the infobar.  This has no
   // effect once the infobar is animating closed.
   void SetArrowTargetHeight(int height);
 
   // Notifies the infobar that it is no longer owned and should close its
   // delegate once it is invisible.
   void CloseSoon();
 
+  // Changes the target height of the main ("bar") portion of the infobar.
+  void SetBarTargetHeight(int height);

[Peter Kasting, 2013/08/26 19:05:13]

Nit: Please also move the implementation in the .cc file to stay in the same
relative order as in this .h file.

+
   const ui::SlideAnimation& animation() const { return animation_; }
   int arrow_height() const { return arrow_height_; }
   int arrow_target_height() const { return arrow_target_height_; }
   int arrow_half_width() const { return arrow_half_width_; }
   int total_height() const { return arrow_height_ + bar_height_; }
 
  protected:
   // ui::AnimationDelegate:
   virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
 
   // Forwards a close request to our owner.
   // NOTE: Subclasses should not call this if we're already unowned.
   void RemoveSelf();
 
-  // Changes the target height of the main ("bar") portion of the infobar.
-  void SetBarTargetHeight(int height);
-
   // Given a control with size |prefsize|, returns the centered y position
   // within us, taking into account animation so the control "slides in" (or
   // out) as we animate open and closed.
   int OffsetY(const gfx::Size& prefsize) const;
 
   InfoBarService* owner() const { return owner_; }
   const InfoBarContainer* container() const { return container_; }
   InfoBarContainer* container() { return container_; }
   ui::SlideAnimation* animation() { return &animation_; }
   int bar_height() const { return bar_height_; }
@@ skipping 31 matching lines @@
   // arrow as two halves on either side of a center point.)
   int arrow_height_;         // Includes both fill and top stroke.
   int arrow_target_height_;
   int arrow_half_width_;     // Includes only fill.
   int bar_height_;           // Includes both fill and bottom separator.
   int bar_target_height_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBar);
 };
 
-#elif defined(OS_MACOSX)
-#include "chrome/browser/ui/cocoa/infobars/infobar.h"
-#endif
-
 #endif  // CHROME_BROWSER_INFOBARS_INFOBAR_H_