Infobar Componentization Proof of Concept

chrome/browser/infobars/infobar.cc

Index: chrome/browser/infobars/infobar.cc
diff --git a/chrome/browser/infobars/infobar.cc b/chrome/browser/infobars/infobar.cc
index 072a009dc578ef0261cd08e9d0c7f0c81c6967c0..03664f8c6ed0b5399569ce1b0fdf9aeec66007bf 100644
--- a/chrome/browser/infobars/infobar.cc
+++ b/chrome/browser/infobars/infobar.cc
@@ -9,7 +9,7 @@
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "chrome/browser/infobars/infobar_container.h"
-#include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/browser/infobars/infobar_manager.h"
 #include "ui/gfx/animation/slide_animation.h"
 
 InfoBar::InfoBar(scoped_ptr<InfoBarDelegate> delegate)
@@ -51,13 +51,16 @@ SkColor InfoBar::GetBottomColor(InfoBarDelegate::Type infobar_type) {
       kWarningBackgroundColorBottom : kPageActionBackgroundColorBottom;
 }
 
-void InfoBar::SetOwner(InfoBarService* owner) {
+void InfoBar::SetOwner(InfoBarManager* owner) {
   DCHECK(!owner_);
   owner_ = owner;
-  delegate_->StoreActiveEntryUniqueID();
   PlatformSpecificSetOwner();
 }
 
+void InfoBar::StoreActiveEntryUniqueID(int entry_id) {
+  delegate_->StoreActiveEntryUniqueID(entry_id);
+}
+
 void InfoBar::Show(bool animate) {
   PlatformSpecificShow(animate);
   if (animate) {