Group the different permission related methods in the content api.

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/command_line.h"
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
@@ skipping 974 matching lines @@
     IPC::Message* reply_msg) {
   // While a JS beforeunload 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::Callback<void(blink::WebNotificationPermission)> done_callback =
-      base::Bind(
-          &RenderFrameHostImpl::PlatformNotificationPermissionRequestDone,
-          weak_ptr_factory_.GetWeakPtr(),
-          request_id);
+  base::Callback<void(bool)> done_callback = base::Bind(
+      &RenderFrameHostImpl::PlatformNotificationPermissionRequestDone,
+      weak_ptr_factory_.GetWeakPtr(),
+      request_id);
 
-  GetContentClient()->browser()->RequestDesktopNotificationPermission(
-      origin, this, done_callback);
+  if (!delegate()->GetAsWebContents())
+    return;
+
+  // TODO(peter): plumb user_gesture and bridge_id.
+  GetContentClient()->browser()->RequestPermission(
+      content::PERMISSION_NOTIFICATIONS,
+      delegate()->GetAsWebContents(),
+      -1 /* bridge id */,
+      origin,
+      true /* user_gesture */,
+      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(
@@ skipping 394 matching lines @@
       common_params, commit_params));
   // TODO(clamy): Check if we should start the throbber for non javascript urls
   // here.
 
   // TODO(clamy): Release the stream handle once the renderer has finished
   // reading it.
   stream_handle_ = body.Pass();
 }
 
 void RenderFrameHostImpl::PlatformNotificationPermissionRequestDone(
-    int request_id, blink::WebNotificationPermission permission) {
+    int request_id,
+    bool granted) {
+  blink::WebNotificationPermission permission =
+      granted ? blink::WebNotificationPermissionAllowed
+              : blink::WebNotificationPermissionDenied;
+
   Send(new PlatformNotificationMsg_PermissionRequestComplete(
       routing_id_, request_id, permission));
 }
 
 void RenderFrameHostImpl::UpdateCrossProcessIframeAccessibility(
     const std::map<int32, int> node_to_frame_routing_id_map) {
   std::map<int32, int>::const_iterator iter;
   for (iter = node_to_frame_routing_id_map.begin();
        iter != node_to_frame_routing_id_map.end();
        ++iter) {
@@ skipping 135 matching lines @@
   // Clear any state if a pending navigation is canceled or preempted.
   if (suspended_nav_params_)
     suspended_nav_params_.reset();
 
   TRACE_EVENT_ASYNC_END0("navigation",
                          "RenderFrameHostImpl navigation suspended", this);
   navigations_suspended_ = false;
 }
 
 }  // namespace content