Migrate the notification permission to the new common permission classes.

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 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/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 629 matching lines @@
   return ratio * (kMaxFSM - kMinFSM) + kMinFSM;
 }
 
 #endif  // defined(OS_ANDROID)
 
 }  // namespace
 
 namespace chrome {
 
 ChromeContentBrowserClient::ChromeContentBrowserClient()
-    : prerender_tracker_(NULL) {
+    : prerender_tracker_(NULL),
+      weak_factory_(this) {
 #if defined(ENABLE_PLUGINS)
   for (size_t i = 0; i < arraysize(kPredefinedAllowedDevChannelOrigins); ++i)
     allowed_dev_channel_origins_.insert(kPredefinedAllowedDevChannelOrigins[i]);
   for (size_t i = 0; i < arraysize(kPredefinedAllowedFileHandleOrigins); ++i)
     allowed_file_handle_origins_.insert(kPredefinedAllowedFileHandleOrigins[i]);
   for (size_t i = 0; i < arraysize(kPredefinedAllowedSocketOrigins); ++i)
     allowed_socket_origins_.insert(kPredefinedAllowedSocketOrigins[i]);
 #endif
 
   permissions_policy_delegate_.reset(
@@ skipping 1368 matching lines @@
       }
     }
   }
   if (IsExtensionWithPermissionOrSuggestInConsole(
           APIPermission::kNotification, extension,
           render_frame_host->GetRenderViewHost())) {
     callback.Run();
     return;
   }
 
+  WebContents* web_contents = WebContents::FromRenderFrameHost(
+       render_frame_host);
+  const PermissionRequestID id(render_frame_host->GetProcess()->GetID(),

[Peter Beverloo, 2014/07/10 11:29:38]

Can we name this request_id? There's a lot of Ids in this code.

[Miguel Garcia, 2014/07/17 17:24:47]

Done.

+      web_contents->GetRoutingID(), -1 /* bridge id */,
+      GURL());
+
   notification_service->RequestPermission(
-      source_origin, render_frame_host, callback);
+      web_contents,
+      id,
+      source_origin,
+      true, /* user gesture always true for notifications */

[Peter Beverloo, 2014/07/10 11:29:38]

This is not true anymore, and we'll have to pass through whether the permission
request was caused by a user gesture from the renderer.

[Miguel Garcia, 2014/07/17 17:24:47]

Seems out of scope for the CL though, the current code as is forces user_gesture
to true with a very explicit comment

https://cs.corp.google.com/#clankium/src/chrome/browser/notifications/desktop...

Passing the user gesture over IPC is trivial and we can do that on a subsequent
CL. I have added a TODO in the mean time.


On 2014/07/10 11:29:38, Peter Beverloo wrote:

+      base::Bind(&ChromeContentBrowserClient::NotificationPermissionRequested,
+                 weak_factory_.GetWeakPtr(), callback));
+
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
 blink::WebNotificationPresenter::Permission
     ChromeContentBrowserClient::CheckDesktopNotificationPermission(
         const GURL& source_origin,
         content::ResourceContext* context,
         int render_process_id) {
@@ skipping 753 matching lines @@
     static const char* const kWebRtcDevSwitchNames[] = {
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
+
+void ChromeContentBrowserClient::NotificationPermissionRequested(
+    base::Closure callback, bool result) {

[Peter Beverloo, 2014/07/10 11:29:38]

Having |result| be here makes me happy :-). This allows us to eliminate yet
another call in RenderFrameHostImpl.

[Miguel Garcia, 2014/07/17 17:24:47]

Acknowledged.

+  callback.Run();
+}
+
 }  // namespace chrome