Merge 22711 - Fix a few bugs with the theme infobar:...

chrome/browser/tab_contents/tab_contents.h

 // Copyright (c) 2009 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_TAB_CONTENTS_TAB_CONTENTS_H_
 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 
 #include "build/build_config.h"
 
 #include <map>
@@ skipping 381 matching lines @@
   bool FocusLocationBarByDefault();
 
   // Infobars ------------------------------------------------------------------
 
   // Adds an InfoBar for the specified |delegate|.
   void AddInfoBar(InfoBarDelegate* delegate);
 
   // Removes the InfoBar for the specified |delegate|.
   void RemoveInfoBar(InfoBarDelegate* delegate);
 
+  // Replaces one infobar with another, without any animation in between.
+  void ReplaceInfoBar(InfoBarDelegate* old_delegate,
+                      InfoBarDelegate* new_delegate);
+
   // Enumeration and access functions.
   int infobar_delegate_count() const { return infobar_delegates_.size(); }
   InfoBarDelegate* GetInfoBarDelegateAt(int index) {
     return infobar_delegates_.at(index);
   }
 
   // Toolbars and such ---------------------------------------------------------
 
   // Returns whether the bookmark bar should be visible.
   virtual bool IsBookmarkBarAlwaysVisible();
@@ skipping 670 matching lines @@
   // True if the user has decided to block future javascript messages. This is
   // reset on navigations to false on navigations.
   bool suppress_javascript_messages_;
 
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(TabContents);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_