Remove code for the old Web Notification permission-path.

content/browser/frame_host/render_frame_host_impl.cc

 // Copyright 2013 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 "content/browser/frame_host/render_frame_host_impl.h"
 
 #include "base/bind.h"
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/user_metrics_action.h"
@@ skipping 332 matching lines @@
                                     OnRunBeforeUnloadConfirm)
     IPC_MESSAGE_HANDLER(FrameHostMsg_DidAccessInitialDocument,
                         OnDidAccessInitialDocument)
     IPC_MESSAGE_HANDLER(FrameHostMsg_DidDisownOpener, OnDidDisownOpener)
     IPC_MESSAGE_HANDLER(FrameHostMsg_UpdateTitle, OnUpdateTitle)
     IPC_MESSAGE_HANDLER(FrameHostMsg_UpdateEncoding, OnUpdateEncoding)
     IPC_MESSAGE_HANDLER(FrameHostMsg_BeginNavigation,
                         OnBeginNavigation)
     IPC_MESSAGE_HANDLER(PlatformNotificationHostMsg_RequestPermission,
                         OnRequestPlatformNotificationPermission)
-    IPC_MESSAGE_HANDLER(DesktopNotificationHostMsg_RequestPermission,
-                        OnRequestDesktopNotificationPermission)
     IPC_MESSAGE_HANDLER(DesktopNotificationHostMsg_Show,
                         OnShowDesktopNotification)
     IPC_MESSAGE_HANDLER(DesktopNotificationHostMsg_Cancel,
                         OnCancelDesktopNotification)
     IPC_MESSAGE_HANDLER(FrameHostMsg_TextSurroundingSelectionResponse,
                         OnTextSurroundingSelectionResponse)
     IPC_MESSAGE_HANDLER(AccessibilityHostMsg_Events, OnAccessibilityEvents)
     IPC_MESSAGE_HANDLER(AccessibilityHostMsg_LocationChanges,
                         OnAccessibilityLocationChanges)
   IPC_END_MESSAGE_MAP()
@@ skipping 469 matching lines @@
   base::Callback<void(blink::WebNotificationPermission)> done_callback =
       base::Bind(
           &RenderFrameHostImpl::PlatformNotificationPermissionRequestDone,
           weak_ptr_factory_.GetWeakPtr(),
           request_id);
 
   GetContentClient()->browser()->RequestDesktopNotificationPermission(
       origin, this, done_callback);
 }
 
-// TODO(peter): Remove this call and the associated IPC messages when Blink
-// has switched to the new Web Notification permission code-path.
-void RenderFrameHostImpl::OnRequestDesktopNotificationPermission(
-    const GURL& source_origin, int callback_context) {
-  base::Callback<void(blink::WebNotificationPermission)> done_callback =
-      base::Bind(&RenderFrameHostImpl::DesktopNotificationPermissionRequestDone,
-                 weak_ptr_factory_.GetWeakPtr(),
-                 callback_context);
-
-  GetContentClient()->browser()->RequestDesktopNotificationPermission(
-      source_origin, this, done_callback);
-}
-
 void RenderFrameHostImpl::OnShowDesktopNotification(
     int notification_id,
     const ShowDesktopNotificationHostMsgParams& params) {
   scoped_ptr<DesktopNotificationDelegateImpl> delegate(
       new DesktopNotificationDelegateImpl(this, notification_id));
 
   base::Closure cancel_callback;
   GetContentClient()->browser()->ShowDesktopNotification(
       params,
       this,
@@ skipping 289 matching lines @@
 void RenderFrameHostImpl::NotificationClosed(int notification_id) {
   cancel_notification_callbacks_.erase(notification_id);
 }
 
 void RenderFrameHostImpl::PlatformNotificationPermissionRequestDone(
     int request_id, blink::WebNotificationPermission permission) {
   Send(new PlatformNotificationMsg_PermissionRequestComplete(
       routing_id_, request_id, permission));
 }
 
-// TODO(peter): Remove this method when Blink uses the new code-path.
-void RenderFrameHostImpl::DesktopNotificationPermissionRequestDone(
-    int callback_context, blink::WebNotificationPermission permission) {
-  Send(new DesktopNotificationMsg_PermissionRequestDone(
-      routing_id_, callback_context));
-}
-
 void RenderFrameHostImpl::SetAccessibilityMode(AccessibilityMode mode) {
   Send(new FrameMsg_SetAccessibilityMode(routing_id_, mode));
 }
 
 void RenderFrameHostImpl::SetAccessibilityCallbackForTesting(
     const base::Callback<void(ui::AXEvent, int)>& callback) {
   accessibility_testing_callback_ = callback;
 }
 
 const ui::AXTree* RenderFrameHostImpl::GetAXTreeForTesting() {
@@ skipping 34 matching lines @@
       FROM_HERE,
       base::Bind(
           &TransitionRequestManager::SetHasPendingTransitionRequest,
           base::Unretained(TransitionRequestManager::GetInstance()),
           GetProcess()->GetID(),
           routing_id_,
           has_pending_request));
 }
 
 }  // namespace content