Misc. infobar stuff:

chrome/browser/tab_contents/infobar.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_H_
-#define CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_H_
+#ifndef CHROME_BROWSER_TAB_CONTENTS_INFOBAR_H_
+#define CHROME_BROWSER_TAB_CONTENTS_INFOBAR_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/gfx/size.h"
 
 class InfoBarContainer;
 class InfoBarDelegate;
+class TabContents;
 
 namespace ui {
 class SlideAnimation;
 }
 
 class InfoBar : public ui::AnimationDelegate {
  public:
-  explicit InfoBar(InfoBarDelegate* delegate);
+  InfoBar(TabContents* owner, InfoBarDelegate* delegate);
   virtual ~InfoBar();
 
   // Platforms must define these.
   static const int kSeparatorLineHeight;
   static const int kDefaultArrowTargetHeight;
   static const int kMaximumArrowTargetHeight;
   // The half-width (see comments on |arrow_half_width_| below) scales to its
   // default and maximum values proportionally to how the height scales to its.
   static const int kDefaultArrowTargetHalfWidth;
   static const int kMaximumArrowTargetHalfWidth;
@@ skipping 55 matching lines @@
   // current ones, calls PlatformSpecificOnHeightRecalculated().  Informs our
   // container our state has changed if either the heights have changed or
   // |force_notify| is set.
   void RecalculateHeights(bool force_notify);
 
   // Checks whether we're closed.  If so, notifies the container that it should
   // remove us (which will cause the platform-specific code to asynchronously
   // delete us) and closes the delegate.
   void MaybeDelete();
 
+  TabContents* owner_;  // TODO(pkasting): Transition to using this.
   InfoBarDelegate* delegate_;
   InfoBarContainer* container_;
   scoped_ptr<ui::SlideAnimation> animation_;
 
   // The current and target heights of the arrow and bar portions, and half the
   // current arrow width.  (It's easier to work in half-widths as we draw the
   // arrow as two halves on either side of a center point.)
   int arrow_height_;         // Includes both fill and top stroke.
   int arrow_target_height_;
   int arrow_half_width_;     // Includes only fill.
   int bar_height_;           // Includes both fill and bottom separator.
   int bar_target_height_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBar);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_H_
+#endif  // CHROME_BROWSER_TAB_CONTENTS_INFOBAR_H_