Infobar Componentization Proof of Concept

chrome/browser/infobars/infobar.cc

 // 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.
 
 #include "chrome/browser/infobars/infobar.h"
 
 #include <cmath>
 
 #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)
     : owner_(NULL),
       delegate_(delegate.Pass()),
       container_(NULL),
       animation_(this),
       arrow_height_(0),
       arrow_target_height_(kDefaultArrowTargetHeight),
       arrow_half_width_(0),
@@ skipping 21 matching lines @@
 // static
 SkColor InfoBar::GetBottomColor(InfoBarDelegate::Type infobar_type) {
   static const SkColor kWarningBackgroundColorBottom =
       SkColorSetRGB(250, 230, 145);  // Yellow
   static const SkColor kPageActionBackgroundColorBottom =
       SkColorSetRGB(217, 217, 217);  // Gray
   return (infobar_type == InfoBarDelegate::WARNING_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) {
     animation_.Show();
   } else {
     animation_.Reset(1.0);
     RecalculateHeights(true);
   }
 }
 
@@ skipping 95 matching lines @@
     container_->OnInfoBarStateChanged(animation_.is_animating());
 }
 
 void InfoBar::MaybeDelete() {
   if (!owner_ && (animation_.GetCurrentValue() == 0.0)) {
     if (container_)
       container_->RemoveInfoBar(this);
     delete this;
   }
 }