Misc. infobar stuff:

chrome/browser/tab_contents/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_UI_VIEWS_INFOBARS_INFOBAR_CONTAINER_H_
-#define CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_CONTAINER_H_
+#ifndef CHROME_BROWSER_TAB_CONTENTS_INFOBAR_CONTAINER_H_
+#define CHROME_BROWSER_TAB_CONTENTS_INFOBAR_CONTAINER_H_
 #pragma once
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 class InfoBar;
 class InfoBarDelegate;
-class TabContents;
+class TabContentsWrapper;
 
 // InfoBarContainer is a cross-platform base class to handle the visibility-
 // related aspects of InfoBars.  While InfoBars own themselves, 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 NotificationObserver {
  public:
@@ skipping 10 matching lines @@
     // 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 TabContents for which this container is showing infobars.  This
-  // will remove all current infobars from the container, add the infobars from
-  // |contents|, and show them all.  |contents| may be NULL.
-  void ChangeTabContents(TabContents* contents);
+  // Changes the TabContentsWrapper for which this container is showing
+  // infobars.  This will remove all current infobars from the container, add
+  // the infobars from |contents|, and show them all.  |contents| may be NULL.
+  void ChangeTabContents(TabContentsWrapper* contents);
 
   // 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
   // desired.
   //
   // IMPORTANT: This MUST NOT result in a call back to
   // Delegate::InfoBarContainerStateChanged() unless it causes an actual
   // change, lest we infinitely recurse.
   void SetMaxTopArrowHeight(int height);
 
   // Called when a contained infobar has animated or by some other means changed
   // its height, or when it stops animating.  The container is expected to do
   // anything necessary to respond, e.g. re-layout.
   void OnInfoBarStateChanged(bool is_animating);
 
-  // Removes the specified InfoBarDelegate from the selected TabContents.  This
-  // will notify us back and cause us to close the InfoBar.  This is called from
-  // the InfoBar's close button handler.
+  // Removes the specified InfoBarDelegate from the selected TabContentsWrapper.
+  // This will notify us back and cause us to close the InfoBar.  This is called
+  // from the InfoBar's close button handler.
   void RemoveDelegate(InfoBarDelegate* delegate);
 
   // Called by |infobar| to request that it be removed from the container, as it
   // is about to delete itself.  At this point, |infobar| should already be
   // hidden.
   void RemoveInfoBar(InfoBar* infobar);
 
   const Delegate* delegate() const { return delegate_; }
 
  protected:
   // Subclasses must call this during destruction, so that we can remove
   // infobars (which will call the pure virtual functions below) while the
   // subclass portion of |this| has not yet been destroyed.
   void RemoveAllInfoBarsForDestruction();
 
   // These must be implemented on each platform to e.g. adjust the visible
   // object hierarchy.
   virtual void PlatformSpecificAddInfoBar(InfoBar* infobar) = 0;
   virtual void PlatformSpecificRemoveInfoBar(InfoBar* infobar) = 0;
 
  private:
   typedef std::vector<InfoBar*> InfoBars;
 
   // NotificationObserver:
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
   // Removes an InfoBar for the specified delegate, in response to a
-  // notification from the selected TabContents. The InfoBar's disappearance
-  // will be animated if |use_animation| is true.
+  // notification from the selected TabContentsWrapper. The InfoBar's
+  // disappearance will be animated if |use_animation| is true.
   void RemoveInfoBar(InfoBarDelegate* delegate, bool use_animation);
 
   // Adds |infobar| to this container 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 OnInfoBarAnimated() either will or won't
   // be called as a result.
   enum CallbackStatus { NO_CALLBACK, WANT_CALLBACK };
   void AddInfoBar(InfoBar* infobar,
                   bool animate,
                   CallbackStatus callback_status);
 
   void UpdateInfoBarArrowTargetHeights();
   int ArrowTargetHeightForInfoBar(size_t infobar_index) const;
 
   NotificationRegistrar registrar_;
   Delegate* delegate_;
-  TabContents* tab_contents_;
+  TabContentsWrapper* tab_contents_;
   InfoBars infobars_;
 
   // Calculated in SetMaxTopArrowHeight().
   int top_arrow_target_height_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBarContainer);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_CONTAINER_H_
+#endif  // CHROME_BROWSER_TAB_CONTENTS_INFOBAR_CONTAINER_H_