Move infobar handling to a tab helper.

chrome/browser/notifications/desktop_notification_service.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/notifications/desktop_notification_service.h"
 
 #include "base/metrics/histogram.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/content_settings_provider.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_object_proxy.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/notifications/notifications_prefs_cache.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/ui/browser_list.h"
@@ skipping 474 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!tab) {
     Browser* browser = BrowserList::GetLastActive();
     if (browser)
       tab = browser->GetSelectedTabContents();
   }
 
   if (!tab)
     return;
 
   TabContentsWrapper* wrapper =

[Peter Kasting, 2011/08/31 18:47:32]

Nit: Move this into the conditional and combine with its usage.

       TabContentsWrapper::GetCurrentWrapperForContents(tab);
 
   // If |origin| hasn't been seen before and the default content setting for
   // notifications is "ask", show an infobar.
   // The cache can only answer queries on the IO thread once it's initialized,
   // so don't ask the cache.
   ContentSetting setting = GetContentSetting(origin);
   if (setting == CONTENT_SETTING_ASK) {
     // Show an info bar requesting permission.
-    wrapper->AddInfoBar(
+    wrapper->infobar_tab_helper()->AddInfoBar(
         new NotificationPermissionInfoBarDelegate(
             tab, origin, DisplayNameForOrigin(origin), process_id,
             route_id, callback_context));
   } else {
     // Notify renderer immediately.
     RenderViewHost* host = RenderViewHost::FromID(process_id, route_id);
     if (host)
       host->DesktopNotificationPermissionRequestDone(callback_context);
   }
 }
@@ skipping 56 matching lines @@
       chrome::NOTIFICATION_DESKTOP_NOTIFICATION_SETTINGS_CHANGED,
       Source<DesktopNotificationService>(this),
       NotificationService::NoDetails());
 }
 
 WebKit::WebNotificationPresenter::Permission
     DesktopNotificationService::HasPermission(const GURL& origin) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return prefs_cache()->HasPermission(origin.GetOrigin());
 }