Mac InfoBar: Use cross platform infobar classes

chrome/browser/infobars/infobar.h

Index: chrome/browser/infobars/infobar.h
diff --git a/chrome/browser/infobars/infobar.h b/chrome/browser/infobars/infobar.h
index 1c0fbb9898fe1e5f2e29b6298782063969a49d7b..179ee18dc01c03f80267ef4d78e7df37cd4909e9 100644
--- a/chrome/browser/infobars/infobar.h
+++ b/chrome/browser/infobars/infobar.h
@@ -26,9 +26,6 @@ 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;
 
@@ -67,6 +64,9 @@ class InfoBar : public ui::AnimationDelegate {
   // 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_; }
@@ -81,9 +81,6 @@ class InfoBar : public ui::AnimationDelegate {
   // 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.
@@ -135,8 +132,4 @@ class InfoBar : public ui::AnimationDelegate {
   DISALLOW_COPY_AND_ASSIGN(InfoBar);
 };
 
-#elif defined(OS_MACOSX)
-#include "chrome/browser/ui/cocoa/infobars/infobar.h"
-#endif
-
 #endif  // CHROME_BROWSER_INFOBARS_INFOBAR_H_