Get rid of Chrome notifications dependency, and instead go through ContentBrowserClient to show U...

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"
@@ skipping 19 matching lines @@
 #include "content/browser/site_instance.h"
 #include "content/browser/worker_host/worker_process_host.h"
 #include "content/common/desktop_notification_messages.h"
 #include "content/common/notification_service.h"
 #include "content/common/notification_type.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/escape.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using WebKit::WebNotificationPresenter;
 using WebKit::WebTextDirection;
 
 const ContentSetting kDefaultSetting = CONTENT_SETTING_ASK;
 
 namespace {
 
@@ skipping 96 matching lines @@
       callback_context_(callback_context),
       action_taken_(false) {
 }
 
 NotificationPermissionInfoBarDelegate::
     ~NotificationPermissionInfoBarDelegate() {
   if (!action_taken_)
     UMA_HISTOGRAM_COUNTS("NotificationPermissionRequest.Ignored", 1);
 
   RenderViewHost* host = RenderViewHost::FromID(process_id_, route_id_);
-  if (host) {
-    host->Send(new DesktopNotificationMsg_PermissionRequestDone(
-        route_id_, callback_context_));
-  }
+  if (host)
+    host->DesktopNotificationPermissionRequestDone(callback_context_);
 }
 
 gfx::Image* NotificationPermissionInfoBarDelegate::GetIcon() const {
   return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
      IDR_PRODUCT_ICON_32);
 }
 
 InfoBarDelegate::Type
     NotificationPermissionInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
@@ skipping 347 matching lines @@
   ContentSetting setting = GetContentSetting(origin);
   if (setting == CONTENT_SETTING_ASK) {
     // Show an info bar requesting permission.
     wrapper->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->Send(new DesktopNotificationMsg_PermissionRequestDone(
-          route_id, callback_context));
-    }
+    if (host)
+      host->DesktopNotificationPermissionRequestDone(callback_context);
   }
 }
 
 void DesktopNotificationService::ShowNotification(
     const Notification& notification) {
   ui_manager_->Add(notification, profile_);
 }
 
 bool DesktopNotificationService::CancelDesktopNotification(
     int process_id, int route_id, int notification_id) {
@@ skipping 43 matching lines @@
   return UTF8ToUTF16(origin.host());
 }
 
 void DesktopNotificationService::NotifySettingsChange() {
   NotificationService::current()->Notify(
       NotificationType::DESKTOP_NOTIFICATION_SETTINGS_CHANGED,
       Source<DesktopNotificationService>(this),
       NotificationService::NoDetails());
 }
 
-int DesktopNotificationService::HasPermission(const GURL& origin) {
+WebKit::WebNotificationPresenter::Permission
+    DesktopNotificationService::HasPermission(const GURL& origin) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return prefs_cache()->HasPermission(origin.GetOrigin());
 }