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

chrome/common/notification_type.h

 // Copyright (c) 2006-2008 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_COMMON_NOTIFICATION_TYPE_H_
 #define CHROME_COMMON_NOTIFICATION_TYPE_H_
 
 // This file describes various types used to describe and filter notifications
 // that pass through the NotificationService.
 //
@@ skipping 258 matching lines @@
     // the InfoBar that was added.
     TAB_CONTENTS_INFOBAR_ADDED,
 
     // This message is sent when an InfoBar is about to be removed from a
     // TabContents. The source is a Source<TabContents> with a pointer to the
     // TabContents the InfoBar was removed from. The details is a
     // Details<InfoBarDelegate> with a pointer to an object implementing the
     // InfoBarDelegate interface for the InfoBar that was removed.
     TAB_CONTENTS_INFOBAR_REMOVED,
 
+    // This message is sent when an InfoBar is replacing another infobar in a
+    // TabContents. The source is a Source<TabContents> with a pointer to the
+    // TabContents the InfoBar was removed from. The details is a
+    // Details<std::pair<InfoBarDelegate*, InfoBarDelegate*> > with a pointer
+    // to the old and new InfoBarDelegates, respectively.
+    TAB_CONTENTS_INFOBAR_REPLACED,
+
     // This is sent when an externally hosted tab is created. The details
     // contain the ExternalTabContainer that contains the tab
     EXTERNAL_TAB_CREATED,
 
     // This is sent when an externally hosted tab is closed.  No details are
     // expected.
     EXTERNAL_TAB_CLOSED,
 
     // Indicates that the new page tab has finished loading. This is used for
     // performance testing to see how fast we can load it after startup, and is
@@ skipping 343 matching lines @@
 };
 
 inline bool operator==(NotificationType::Type a, NotificationType b) {
   return a == b.value;
 }
 inline bool operator!=(NotificationType::Type a, NotificationType b) {
   return a != b.value;
 }
 
 #endif  // CHROME_COMMON_NOTIFICATION_TYPE_H_