Make NotificationService an interface in the content namespace, and switch callers to use it. Mov...

chrome/browser/infobars/infobar_tab_helper.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/infobars/infobar_tab_helper.h"
 
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_delegate.h"
 #include "chrome/browser/tab_contents/insecure_content_infobar_delegate.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/render_messages.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "content/browser/tab_contents/tab_contents.h"
 
 InfoBarTabHelper::InfoBarTabHelper(TabContents* tab_contents)
     : TabContentsObserver(tab_contents),
       infobars_enabled_(true) {
   DCHECK(tab_contents);
 }
 
 InfoBarTabHelper::~InfoBarTabHelper() {
   // Destroy all remaining InfoBars.  It's important to not animate here so that
@@ skipping 14 matching lines @@
   for (size_t i = 0; i < infobars_.size(); ++i) {
     if (GetInfoBarDelegateAt(i)->EqualsDelegate(delegate)) {
       delegate->InfoBarClosed();
       return;
     }
   }
 
   // TODO(pkasting): Consider removing InfoBarTabHelper arg from delegate
   // constructors and instead using a setter from here.
   infobars_.push_back(delegate);
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
       content::Source<InfoBarTabHelper>(this),
       content::Details<InfoBarAddedDetails>(delegate));
 
   // Add ourselves as an observer for navigations the first time a delegate is
   // added. We use this notification to expire InfoBars that need to expire on
   // page transitions.
   if (infobars_.size() == 1) {
     registrar_.Add(
         this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
@@ skipping 16 matching lines @@
   for (i = 0; i < infobars_.size(); ++i) {
     if (GetInfoBarDelegateAt(i) == old_delegate)
       break;
   }
   DCHECK_LT(i, infobars_.size());
 
   infobars_.insert(infobars_.begin() + i, new_delegate);
 
   old_delegate->clear_owner();
   InfoBarReplacedDetails replaced_details(old_delegate, new_delegate);
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REPLACED,
       content::Source<InfoBarTabHelper>(this),
       content::Details<InfoBarReplacedDetails>(&replaced_details));
 
   infobars_.erase(infobars_.begin() + i + 1);
 }
 
 InfoBarDelegate* InfoBarTabHelper::GetInfoBarDelegateAt(size_t index) {
   return infobars_[index];
 }
 
 void InfoBarTabHelper::RemoveInfoBarInternal(InfoBarDelegate* delegate,
                                              bool animate) {
   if (!infobars_enabled_) {
     DCHECK(infobars_.empty());
     return;
   }
 
   size_t i;
   for (i = 0; i < infobars_.size(); ++i) {
     if (GetInfoBarDelegateAt(i) == delegate)
       break;
   }
   DCHECK_LT(i, infobars_.size());
   InfoBarDelegate* infobar = infobars_[i];
 
   infobar->clear_owner();
   InfoBarRemovedDetails removed_details(infobar, animate);
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
       content::Source<InfoBarTabHelper>(this),
       content::Details<InfoBarRemovedDetails>(&removed_details));
 
   infobars_.erase(infobars_.begin() + i);
   // Remove ourselves as an observer if we are tracking no more InfoBars.
   if (infobars_.empty()) {
     registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
         content::Source<NavigationController>(&tab_contents()->controller()));
   }
@@ skipping 66 matching lines @@
         if (delegate->ShouldExpire(committed_details))
           RemoveInfoBar(delegate);
       }
 
       break;
     }
     default:
       NOTREACHED();
   }
 }