Misc. infobar stuff:

chrome/browser/ui/views/infobars/link_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/ui/views/infobars/link_infobar.h"
 
 #include "chrome/browser/tab_contents/link_infobar_delegate.h"
 #include "chrome/browser/ui/views/event_utils.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
 
 // LinkInfoBarDelegate --------------------------------------------------------
 
-InfoBar* LinkInfoBarDelegate::CreateInfoBar() {
-  return new LinkInfoBar(this);
+InfoBar* LinkInfoBarDelegate::CreateInfoBar(TabContentsWrapper* owner) {
+  return new LinkInfoBar(owner, this);
 }
 
 // LinkInfoBar ----------------------------------------------------------------
 
-LinkInfoBar::LinkInfoBar(LinkInfoBarDelegate* delegate)
-    : InfoBarView(delegate),
+LinkInfoBar::LinkInfoBar(TabContentsWrapper* owner,
+                         LinkInfoBarDelegate* delegate)
+    : InfoBarView(owner, delegate),
       label_1_(NULL),
       link_(NULL),
       label_2_(NULL) {
 }
 
 LinkInfoBar::~LinkInfoBar() {
 }
 
 void LinkInfoBar::Layout() {
   InfoBarView::Layout();
@@ skipping 42 matching lines @@
   DCHECK(link_ != NULL);
   DCHECK_EQ(link_, source);
   if (GetDelegate()->LinkClicked(
       event_utils::DispositionFromEventFlags(event_flags)))
     RemoveInfoBar();
 }
 
 LinkInfoBarDelegate* LinkInfoBar::GetDelegate() {
   return delegate()->AsLinkInfoBarDelegate();
 }