Misc. infobar stuff:

chrome/browser/ui/views/infobars/infobar_view.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_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_VIEW_H_
 #pragma once
 
 #include "base/task.h"
-#include "chrome/browser/ui/views/infobars/infobar.h"
+#include "chrome/browser/tab_contents/infobar.h"
+#include "chrome/browser/tab_contents/infobar_container.h"
 #include "chrome/browser/ui/views/infobars/infobar_background.h"
-#include "chrome/browser/ui/views/infobars/infobar_container.h"
 #include "views/controls/button/button.h"
 #include "views/focus/focus_manager.h"
 
 class SkPath;
 
 namespace views {
 class ExternalFocusTracker;
 class ImageButton;
 class ImageView;
 class Label;
 class Link;
 class LinkListener;
 class MenuButton;
 class TextButton;
 class ViewMenuDelegate;
 }
 
 class InfoBarView : public InfoBar,
                     public views::View,
                     public views::ButtonListener,
                     public views::FocusChangeListener {
  public:
-  explicit InfoBarView(InfoBarDelegate* delegate);
+  InfoBarView(TabContentsWrapper* owner, InfoBarDelegate* delegate);
 
   SkPath* fill_path() const { return fill_path_.get(); }
   SkPath* stroke_path() const { return stroke_path_.get(); }
 
  protected:
   static const int kButtonButtonSpacing;
   static const int kEndOfLabelSpacing;
 
   virtual ~InfoBarView();
 
@@ skipping 79 matching lines @@
 
   // The paths for the InfoBarBackground to draw, sized according to the heights
   // above.
   scoped_ptr<SkPath> fill_path_;
   scoped_ptr<SkPath> stroke_path_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_VIEW_H_