Infobar Componentization Proof of Concept

chrome/browser/infobars/infobar_container.h

 // Copyright (c) 2011 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_CONTAINER_H_
 #define CHROME_BROWSER_INFOBARS_INFOBAR_CONTAINER_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/time/time.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
+#include "chrome/browser/infobars/infobar_manager.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 class InfoBar;
-class InfoBarService;
 
 // InfoBarContainer is a cross-platform base class to handle the visibility-
-// related aspects of InfoBars.  While InfoBarService owns the InfoBars, the
+// related aspects of InfoBars.  While InfoBarManager owns the InfoBars, the
 // InfoBarContainer is responsible for telling particular InfoBars that they
 // should be hidden or visible.
 //
 // Platforms need to subclass this to implement a few platform-specific
 // functions, which are pure virtual here.
-class InfoBarContainer : public content::NotificationObserver {
+class InfoBarContainer : InfoBarManager::Observer {

[droger, 2014/03/18 15:59:53]

InfoBarContained now observes InfoBarManager instead of Notifications.

  public:
   class Delegate {
    public:
     // The separator color may vary depending on where the container is hosted.
     virtual SkColor GetInfoBarSeparatorColor() const = 0;
 
     // The delegate is notified each time the infobar container changes height,
     // as well as when it stops animating.
     virtual void InfoBarContainerStateChanged(bool is_animating) = 0;
 
     // The delegate needs to tell us whether "unspoofable" arrows should be
     // drawn, and if so, at what |x| coordinate.  |x| may be NULL.
     virtual bool DrawInfoBarArrows(int* x) const = 0;
 
    protected:
     virtual ~Delegate();
   };
 
   explicit InfoBarContainer(Delegate* delegate);
   virtual ~InfoBarContainer();
 
-  // Changes the InfoBarService for which this container is showing infobars.
+  // Changes the InfoBarManager for which this container is showing infobars.
   // This will hide all current infobars, remove them from the container, add
-  // the infobars from |infobar_service|, and show them all.  |infobar_service|
+  // the infobars from |infobar_manager|, and show them all.  |infobar_manager|
   // may be NULL.
-  void ChangeInfoBarService(InfoBarService* infobar_service);
+  void ChangeInfoBarManager(InfoBarManager* infobar_manager);
 
   // Returns the amount by which to overlap the toolbar above, and, when
   // |total_height| is non-NULL, set it to the height of the InfoBarContainer
   // (including overlap).
   int GetVerticalOverlap(int* total_height);
 
   // Called by the delegate when the distance between what the top infobar's
   // "unspoofable" arrow would point to and the top infobar itself changes.
   // This enables the top infobar to show a longer arrow (e.g. because of a
   // visible bookmark bar) or shorter (e.g. due to being in a popup window) if
@@ skipping 31 matching lines @@
   // until the translate infobar is implemented as three different infobars like
   // GTK does.
   virtual void PlatformSpecificReplaceInfoBar(InfoBar* old_infobar,
                                               InfoBar* new_infobar) {}
   virtual void PlatformSpecificRemoveInfoBar(InfoBar* infobar) = 0;
   virtual void PlatformSpecificInfoBarStateChanged(bool is_animating) {}
 
  private:
   typedef std::vector<InfoBar*> InfoBars;
 
-  // content::NotificationObserver:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  // InfoBarManager::Observer:
+  virtual void OnInfoBarAdded(InfoBar* infobar) OVERRIDE;
+  virtual void OnInfoBarReplaced(InfoBar* old_infobar,

[Peter Kasting, 2014/03/18 18:29:17]

Nit: Here and elsewhere, put these in alphabetical order

+                                 InfoBar* new_infobar) OVERRIDE;
+  virtual void OnInfoBarRemoved(InfoBar* infobar, bool animate) OVERRIDE;
 
   // Hides all infobars in this container without animation.
   void HideAllInfoBars();
 
   // Adds |infobar| to this container before the existing infobar at position
   // |position| and calls Show() on it.  |animate| is passed along to
   // infobar->Show().  Depending on the value of |callback_status|, this calls
   // infobar->set_container(this) either before or after the call to Show() so
   // that OnInfoBarStateChanged() either will or won't be called as a result.
   enum CallbackStatus { NO_CALLBACK, WANT_CALLBACK };
   void AddInfoBar(InfoBar* infobar,
                   size_t position,
                   bool animate,
                   CallbackStatus callback_status);
 
   void UpdateInfoBarArrowTargetHeights();
   int ArrowTargetHeightForInfoBar(size_t infobar_index) const;
 
-  content::NotificationRegistrar registrar_;
   Delegate* delegate_;
-  InfoBarService* infobar_service_;
+  InfoBarManager* infobar_manager_;
   InfoBars infobars_;
 
   // Calculated in SetMaxTopArrowHeight().
   int top_arrow_target_height_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBarContainer);
 };
 
 #endif  // CHROME_BROWSER_INFOBARS_INFOBAR_CONTAINER_H_