From aa1834c788f85aef89c3e39cf8258e8d2ad42281 Mon Sep 17 00:00:00 2001 From: "thakis@chromium.org" Date: Thu, 1 Sep 2011 16:48:17 +0000 Subject: Revert 99187 (speculative revert for ProfileSyncServiceSessionTest.FailModelAssociation on 10.5) - Move infobar handling to a tab helper, part 1. BUG=94741 TEST=no visible change Review URL: http://codereview.chromium.org/7810002 TBR=avi@chromium.org Review URL: http://codereview.chromium.org/7827017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99198 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/notifications/desktop_notification_service.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'chrome/browser/notifications') diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc index 89e7d38..bd46686 100644 --- a/chrome/browser/notifications/desktop_notification_service.cc +++ b/chrome/browser/notifications/desktop_notification_service.cc @@ -12,7 +12,6 @@ #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" @@ -338,6 +337,9 @@ void DesktopNotificationService::RequestPermission( if (!tab) return; + TabContentsWrapper* wrapper = + 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, @@ -345,9 +347,7 @@ void DesktopNotificationService::RequestPermission( ContentSetting setting = GetContentSetting(origin); if (setting == CONTENT_SETTING_ASK) { // Show an info bar requesting permission. - TabContentsWrapper* wrapper = - TabContentsWrapper::GetCurrentWrapperForContents(tab); - wrapper->infobar_tab_helper()->AddInfoBar( + wrapper->AddInfoBar( new NotificationPermissionInfoBarDelegate( tab, origin, DisplayNameForOrigin(origin), process_id, route_id, callback_context)); -- cgit v1.1