Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Side by Side Diff: content/renderer/notification_permission_dispatcher.cc

Issue 2009773002: Add user_gesture bit back to Mojo PermissionService methods. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/notification_permission_dispatcher.h" 5 #include "content/renderer/notification_permission_dispatcher.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "content/public/common/service_registry.h" 10 #include "content/public/common/service_registry.h"
11 #include "content/public/renderer/render_frame.h" 11 #include "content/public/renderer/render_frame.h"
12 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h" 12 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
13 #include "third_party/WebKit/public/platform/WebString.h" 13 #include "third_party/WebKit/public/platform/WebString.h"
14 #include "third_party/WebKit/public/platform/modules/permissions/permission_stat us.mojom-blink.h" 14 #include "third_party/WebKit/public/platform/modules/permissions/permission_stat us.mojom-blink.h"
15 #include "third_party/WebKit/public/platform/modules/permissions/permission_stat us.mojom.h" 15 #include "third_party/WebKit/public/platform/modules/permissions/permission_stat us.mojom.h"
16 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
16 #include "third_party/WebKit/public/web/modules/notifications/WebNotificationPer missionCallback.h" 17 #include "third_party/WebKit/public/web/modules/notifications/WebNotificationPer missionCallback.h"
17 18
18 using blink::WebNotificationPermissionCallback; 19 using blink::WebNotificationPermissionCallback;
19 20
20 namespace content { 21 namespace content {
21 22
22 NotificationPermissionDispatcher::NotificationPermissionDispatcher( 23 NotificationPermissionDispatcher::NotificationPermissionDispatcher(
23 RenderFrame* render_frame) 24 RenderFrame* render_frame)
24 : RenderFrameObserver(render_frame) {} 25 : RenderFrameObserver(render_frame) {}
25 26
26 NotificationPermissionDispatcher::~NotificationPermissionDispatcher() {} 27 NotificationPermissionDispatcher::~NotificationPermissionDispatcher() {}
27 28
28 void NotificationPermissionDispatcher::RequestPermission( 29 void NotificationPermissionDispatcher::RequestPermission(
29 const blink::WebSecurityOrigin& origin, 30 const blink::WebSecurityOrigin& origin,
30 WebNotificationPermissionCallback* callback) { 31 WebNotificationPermissionCallback* callback) {
31 if (!permission_service_.get()) { 32 if (!permission_service_.get()) {
32 render_frame()->GetServiceRegistry()->ConnectToRemoteService( 33 render_frame()->GetServiceRegistry()->ConnectToRemoteService(
33 mojo::GetProxy(&permission_service_)); 34 mojo::GetProxy(&permission_service_));
34 } 35 }
35 36
36 std::unique_ptr<WebNotificationPermissionCallback> owned_callback(callback); 37 std::unique_ptr<WebNotificationPermissionCallback> owned_callback(callback);
37 38
38 // base::Unretained is safe here because the Mojo channel, with associated 39 // base::Unretained is safe here because the Mojo channel, with associated
39 // callbacks, will be deleted before the "this" instance is deleted. 40 // callbacks, will be deleted before the "this" instance is deleted.
40 permission_service_->RequestPermission( 41 permission_service_->RequestPermission(
41 blink::mojom::PermissionName::NOTIFICATIONS, origin.toString().utf8(), 42 blink::mojom::PermissionName::NOTIFICATIONS, origin.toString().utf8(),
43 blink::WebUserGestureIndicator::isProcessingUserGesture(),
42 base::Bind(&NotificationPermissionDispatcher::OnPermissionRequestComplete, 44 base::Bind(&NotificationPermissionDispatcher::OnPermissionRequestComplete,
43 base::Unretained(this), 45 base::Unretained(this),
44 base::Passed(std::move(owned_callback)))); 46 base::Passed(std::move(owned_callback))));
45 } 47 }
46 48
47 void NotificationPermissionDispatcher::OnPermissionRequestComplete( 49 void NotificationPermissionDispatcher::OnPermissionRequestComplete(
48 std::unique_ptr<WebNotificationPermissionCallback> callback, 50 std::unique_ptr<WebNotificationPermissionCallback> callback,
49 blink::mojom::PermissionStatus status) { 51 blink::mojom::PermissionStatus status) {
50 DCHECK(callback); 52 DCHECK(callback);
51 53
52 blink::mojom::blink::PermissionStatus blink_status = 54 blink::mojom::blink::PermissionStatus blink_status =
53 static_cast<blink::mojom::blink::PermissionStatus>(status); 55 static_cast<blink::mojom::blink::PermissionStatus>(status);
54 56
55 callback->permissionRequestComplete(blink_status); 57 callback->permissionRequestComplete(blink_status);
56 } 58 }
57 59
58 } // namespace content 60 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/midi_dispatcher.cc ('k') | third_party/WebKit/Source/modules/geolocation/Geolocation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698