Refactor Web Notification permission requests.

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"
 #include "base/time/time.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/frame_host/cross_process_frame_connector.h"
 #include "content/browser/frame_host/cross_site_transferring_request.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/render_frame_host_delegate.h"
 #include "content/browser/frame_host/render_frame_proxy_host.h"
 #include "content/browser/renderer_host/input/input_router.h"
 #include "content/browser/renderer_host/input/timeout_monitor.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/transition_request_manager.h"
 #include "content/common/desktop_notification_messages.h"
 #include "content/common/frame_messages.h"
 #include "content/common/input_messages.h"
 #include "content/common/inter_process_time_ticks_converter.h"
+#include "content/common/platform_notification_messages.h"
 #include "content/common/render_frame_setup.mojom.h"
 #include "content/common/swapped_out_messages.h"
+#include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/desktop_notification_delegate.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/url_utils.h"
 #include "url/gurl.h"
@@ skipping 287 matching lines @@
                         OnJavaScriptExecuteResponse)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(FrameHostMsg_RunJavaScriptMessage,
                                     OnRunJavaScriptMessage)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(FrameHostMsg_RunBeforeUnloadConfirm,
                                     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(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_END_MESSAGE_MAP()
 
@@ skipping 345 matching lines @@
     const base::string16& message,
     bool is_reload,
     IPC::Message* reply_msg) {
   // While a JS before unload dialog is showing, tabs in the same process
   // shouldn't process input events.
   GetProcess()->SetIgnoreInputEvents(true);
   render_view_host_->StopHangMonitorTimeout();
   delegate_->RunBeforeUnloadConfirm(this, message, is_reload, reply_msg);
 }
 
+void RenderFrameHostImpl::OnRequestPlatformNotificationPermission(
+    const GURL& origin, int request_id) {
+  base::Closure done_callback = base::Bind(
+      &RenderFrameHostImpl::PlatformNotificationPermissionRequestDone,
+      weak_ptr_factory_.GetWeakPtr(), origin, 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::Closure done_callback = base::Bind(
       &RenderFrameHostImpl::DesktopNotificationPermissionRequestDone,
       weak_ptr_factory_.GetWeakPtr(), callback_context);
   GetContentClient()->browser()->RequestDesktopNotificationPermission(
       source_origin, this, done_callback);
 }
 
 void RenderFrameHostImpl::OnShowDesktopNotification(
@@ skipping 210 matching lines @@
     render_view_host_->delegate_->RendererUnresponsive(
         render_view_host_,
         render_view_host_->is_waiting_for_beforeunload_ack(),
         render_view_host_->IsWaitingForUnloadACK());
 }
 
 void RenderFrameHostImpl::NotificationClosed(int notification_id) {
   cancel_notification_callbacks_.erase(notification_id);
 }
 
+void RenderFrameHostImpl::PlatformNotificationPermissionRequestDone(
+    const GURL& origin, int request_id) {
+  blink::WebNotificationPermission permission =
+      blink::WebNotificationPermissionAllowed;

[Jun Mukai, 2014/07/15 21:49:32]

Should this be Denied?  Allowing notifications if compiled with
ENABLE_NOTIFICATIONS=false doesn't sound correct.

[Peter Beverloo, 2014/07/15 21:53:48]

I'm merely copying the logic in
RenderMessageFilter::OnCheckNotificationPermission. It's not uncommon to default
features to allowed in content, but I agree that Denied would make more sense
here. I'll change that in the morning.

+#if defined(ENABLE_NOTIFICATIONS)
+  permission = static_cast<blink::WebNotificationPermission>(
+      GetContentClient()->browser()->CheckDesktopNotificationPermission(
+          origin,
+          GetProcess()->GetBrowserContext()->GetResourceContext(),
+          GetProcess()->GetID()));
+#endif
+
+  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) {
   Send(new DesktopNotificationMsg_PermissionRequestDone(
       routing_id_, callback_context));
 }
 
 void RenderFrameHostImpl::SetHasPendingTransitionRequest(
     bool has_pending_request) {
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(
           &TransitionRequestManager::SetHasPendingTransitionRequest,
           base::Unretained(TransitionRequestManager::GetInstance()),
           GetProcess()->GetID(),
           routing_id_,
           has_pending_request));
 }
 
 }  // namespace content