Moving notification types which are chrome specific to a new header file chrome_notification_type...

chrome/browser/tab_contents/infobar_container.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 "build/build_config.h"
 
 // TODO(pkasting): Port Mac to use this.
 #if defined(TOOLKIT_VIEWS) || defined(TOOLKIT_GTK)
 
 #include "chrome/browser/tab_contents/infobar_container.h"
 
 #include "chrome/browser/tab_contents/infobar.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 #include "ui/base/animation/slide_animation.h"
 
 InfoBarContainer::Delegate::~Delegate() {
 }
 
 InfoBarContainer::InfoBarContainer(Delegate* delegate)
     : delegate_(delegate),
       tab_contents_(NULL),
@@ skipping 11 matching lines @@
   while (!infobars_.empty()) {
     InfoBar* infobar = infobars_.front();
     // Inform the infobar that it's hidden.  If it was already closing, this
     // closes its delegate.
     infobar->Hide(false);
   }
 
   tab_contents_ = contents;
   if (tab_contents_) {
     Source<TabContentsWrapper> tc_source(tab_contents_);
-    registrar_.Add(this, NotificationType::TAB_CONTENTS_INFOBAR_ADDED,
+    registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
                    tc_source);
-    registrar_.Add(this, NotificationType::TAB_CONTENTS_INFOBAR_REMOVED,
+    registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
                    tc_source);
-    registrar_.Add(this, NotificationType::TAB_CONTENTS_INFOBAR_REPLACED,
+    registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REPLACED,
                    tc_source);
 
     for (size_t i = 0; i < tab_contents_->infobar_count(); ++i) {
       // As when we removed the infobars above, we prevent callbacks to
       // OnInfoBarAnimated() for each infobar.
       AddInfoBar(
           tab_contents_->GetInfoBarDelegateAt(i)->CreateInfoBar(tab_contents_),
           i, false, NO_CALLBACK);
     }
   }
@@ skipping 52 matching lines @@
   // and at worst disastrous to call that.
   delegate_ = NULL;
 
   // TODO(pkasting): Remove this once TabContentsWrapper calls CloseSoon().
   for (size_t i = infobars_.size(); i > 0; --i)
     infobars_[i - 1]->CloseSoon();
 
   ChangeTabContents(NULL);
 }
 
-void InfoBarContainer::Observe(NotificationType type,
+void InfoBarContainer::Observe(int type,
                                const NotificationSource& source,
                                const NotificationDetails& details) {
-  switch (type.value) {
-    case NotificationType::TAB_CONTENTS_INFOBAR_ADDED:
+  switch (type) {
+    case chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED:
       AddInfoBar(
           Details<InfoBarAddedDetails>(details)->CreateInfoBar(tab_contents_),
           infobars_.size(), true, WANT_CALLBACK);
       break;
 
-    case NotificationType::TAB_CONTENTS_INFOBAR_REMOVED: {
+    case chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED: {
       InfoBarRemovedDetails* removed_details =
           Details<InfoBarRemovedDetails>(details).ptr();
       RemoveInfoBar(removed_details->first, removed_details->second);
       break;
     }
 
-    case NotificationType::TAB_CONTENTS_INFOBAR_REPLACED: {
+    case chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REPLACED: {
       InfoBarReplacedDetails* replaced_details =
           Details<InfoBarReplacedDetails>(details).ptr();
       AddInfoBar(replaced_details->second->CreateInfoBar(tab_contents_),
           RemoveInfoBar(replaced_details->first, false), false, WANT_CALLBACK);
       break;
     }
 
     default:
       NOTREACHED();
       break;
@@ skipping 55 matching lines @@
     return InfoBar::kDefaultArrowTargetHeight;
   // When the first infobar is animating closed, we animate the second infobar's
   // arrow target height from the default to the top target height.  Note that
   // the animation values here are going from 1.0 -> 0.0 as the top bar closes.
   return top_arrow_target_height_ + static_cast<int>(
       (InfoBar::kDefaultArrowTargetHeight - top_arrow_target_height_) *
           first_infobar_animation.GetCurrentValue());
 }
 
 #endif  // TOOLKIT_VIEWS || defined(TOOLKIT_GTK)