summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormlamouri <mlamouri@chromium.org>2016-02-19 09:08:27 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-19 17:09:54 +0000
commit27b97a28935fa4cb2bbb9e087933629ba49d899b (patch)
treeefad7bf21eaa469cb84e99750342b0ddd88852bc
parentb0465390730320789e2cef9f73c603e1aa2d81c5 (diff)
downloadchromium_src-27b97a28935fa4cb2bbb9e087933629ba49d899b.zip
chromium_src-27b97a28935fa4cb2bbb9e087933629ba49d899b.tar.gz
chromium_src-27b97a28935fa4cb2bbb9e087933629ba49d899b.tar.bz2
Remove user_gesture bit from Mojo PermissionService methods.
The user gesture information was required by the permission bubble code. With bug 545476 fixed, this is no longer needed. This CL is the last CL in a suite of three CL that remove the passing of the user gesture information from the renderer process content layer to the browser process chrome layer: 1. https://codereview.chromium.org/1695943002 2. https://codereview.chromium.org/1695953002 3. <this> BUG=423770 Review URL: https://codereview.chromium.org/1696883004 Cr-Commit-Position: refs/heads/master@{#376467}
-rw-r--r--content/browser/permissions/permission_service_impl.cc2
-rw-r--r--content/browser/permissions/permission_service_impl.h2
-rw-r--r--content/child/permissions/permission_dispatcher.cc3
-rw-r--r--content/common/permission_service.mojom4
-rw-r--r--content/renderer/geolocation_dispatcher.cc2
-rw-r--r--content/renderer/media/media_permission_dispatcher.cc2
-rw-r--r--content/renderer/media/midi_dispatcher.cc2
-rw-r--r--content/renderer/notification_permission_dispatcher.cc2
8 files changed, 2 insertions, 17 deletions
diff --git a/content/browser/permissions/permission_service_impl.cc b/content/browser/permissions/permission_service_impl.cc
index 5fc67cf..8d07e36 100644
--- a/content/browser/permissions/permission_service_impl.cc
+++ b/content/browser/permissions/permission_service_impl.cc
@@ -109,7 +109,6 @@ void PermissionServiceImpl::OnConnectionError() {
void PermissionServiceImpl::RequestPermission(
PermissionName permission,
const mojo::String& origin,
- bool user_gesture,
const PermissionStatusCallback& callback) {
// This condition is valid if the call is coming from a ChildThread instead of
// a RenderFrame. Some consumers of the service run in Workers and some in
@@ -155,7 +154,6 @@ void PermissionServiceImpl::OnRequestPermissionResponse(
void PermissionServiceImpl::RequestPermissions(
mojo::Array<PermissionName> permissions,
const mojo::String& origin,
- bool user_gesture,
const PermissionsStatusCallback& callback) {
if (permissions.is_null()) {
callback.Run(mojo::Array<PermissionStatus>());
diff --git a/content/browser/permissions/permission_service_impl.h b/content/browser/permissions/permission_service_impl.h
index 13761da..098a9e3 100644
--- a/content/browser/permissions/permission_service_impl.h
+++ b/content/browser/permissions/permission_service_impl.h
@@ -74,11 +74,9 @@ class PermissionServiceImpl : public PermissionService {
const PermissionStatusCallback& callback) override;
void RequestPermission(PermissionName permission,
const mojo::String& origin,
- bool user_gesture,
const PermissionStatusCallback& callback) override;
void RequestPermissions(mojo::Array<PermissionName> permissions,
const mojo::String& origin,
- bool user_gesture,
const PermissionsStatusCallback& callback) override;
void RevokePermission(PermissionName permission,
const mojo::String& origin,
diff --git a/content/child/permissions/permission_dispatcher.cc b/content/child/permissions/permission_dispatcher.cc
index 59f479d..d626887 100644
--- a/content/child/permissions/permission_dispatcher.cc
+++ b/content/child/permissions/permission_dispatcher.cc
@@ -12,7 +12,6 @@
#include "content/public/common/service_registry.h"
#include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/public/platform/modules/permissions/WebPermissionObserver.h"
-#include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
using blink::WebPermissionObserver;
@@ -268,7 +267,6 @@ void PermissionDispatcher::RequestPermissionInternal(
GetPermissionServicePtr()->RequestPermission(
GetPermissionName(type),
origin,
- blink::WebUserGestureIndicator::isProcessingUserGesture(),
base::Bind(&PermissionDispatcher::OnPermissionResponse,
base::Unretained(this),
worker_thread_id,
@@ -294,7 +292,6 @@ void PermissionDispatcher::RequestPermissionsInternal(
GetPermissionServicePtr()->RequestPermissions(
std::move(names), origin,
- blink::WebUserGestureIndicator::isProcessingUserGesture(),
base::Bind(&PermissionDispatcher::OnRequestPermissionsResponse,
base::Unretained(this), worker_thread_id, callback_key));
}
diff --git a/content/common/permission_service.mojom b/content/common/permission_service.mojom
index 5a61787..ef25cf6 100644
--- a/content/common/permission_service.mojom
+++ b/content/common/permission_service.mojom
@@ -24,9 +24,9 @@ enum PermissionName {
interface PermissionService {
HasPermission(PermissionName permission, string origin)
=> (PermissionStatus status);
- RequestPermission(PermissionName permission, string origin, bool user_gesture)
+ RequestPermission(PermissionName permission, string origin)
=> (PermissionStatus status);
- RequestPermissions(array<PermissionName> permission, string origin, bool user_gesture)
+ RequestPermissions(array<PermissionName> permission, string origin)
=> (array<PermissionStatus> statuses);
RevokePermission(PermissionName permission, string origin)
=> (PermissionStatus status);
diff --git a/content/renderer/geolocation_dispatcher.cc b/content/renderer/geolocation_dispatcher.cc
index 20d3add..1c61eca 100644
--- a/content/renderer/geolocation_dispatcher.cc
+++ b/content/renderer/geolocation_dispatcher.cc
@@ -12,7 +12,6 @@
#include "third_party/WebKit/public/web/WebGeolocationClient.h"
#include "third_party/WebKit/public/web/WebGeolocationPosition.h"
#include "third_party/WebKit/public/web/WebGeolocationError.h"
-#include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
using blink::WebGeolocationController;
using blink::WebGeolocationError;
@@ -83,7 +82,6 @@ void GeolocationDispatcher::requestPermission(
permission_service_->RequestPermission(
PermissionName::GEOLOCATION,
permissionRequest.securityOrigin().toString().utf8(),
- blink::WebUserGestureIndicator::isProcessingUserGesture(),
base::Bind(&GeolocationDispatcher::OnPermissionSet,
base::Unretained(this), permission_request_id));
}
diff --git a/content/renderer/media/media_permission_dispatcher.cc b/content/renderer/media/media_permission_dispatcher.cc
index 89baa3f..ab6d7ec 100644
--- a/content/renderer/media/media_permission_dispatcher.cc
+++ b/content/renderer/media/media_permission_dispatcher.cc
@@ -9,7 +9,6 @@
#include "base/single_thread_task_runner.h"
#include "base/thread_task_runner_handle.h"
#include "media/base/bind_to_current_loop.h"
-#include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
#include "url/gurl.h"
namespace {
@@ -99,7 +98,6 @@ void MediaPermissionDispatcher::RequestPermission(
permission_service_->RequestPermission(
MediaPermissionTypeToPermissionName(type), security_origin.spec(),
- blink::WebUserGestureIndicator::isProcessingUserGesture(),
base::Bind(&MediaPermissionDispatcher::OnPermissionStatus, weak_ptr_,
request_id));
}
diff --git a/content/renderer/media/midi_dispatcher.cc b/content/renderer/media/midi_dispatcher.cc
index b5aa220..4cb43e4 100644
--- a/content/renderer/media/midi_dispatcher.cc
+++ b/content/renderer/media/midi_dispatcher.cc
@@ -9,7 +9,6 @@
#include "content/public/renderer/render_frame.h"
#include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
#include "third_party/WebKit/public/platform/WebString.h"
-#include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
#include "third_party/WebKit/public/web/modules/webmidi/WebMIDIOptions.h"
#include "third_party/WebKit/public/web/modules/webmidi/WebMIDIPermissionRequest.h"
@@ -42,7 +41,6 @@ void MidiDispatcher::requestPermission(const WebMIDIPermissionRequest& request,
permission_service_->RequestPermission(
permission_name, request.securityOrigin().toString().utf8(),
- blink::WebUserGestureIndicator::isProcessingUserGesture(),
base::Bind(&MidiDispatcher::OnPermissionSet, base::Unretained(this),
permission_request_id));
}
diff --git a/content/renderer/notification_permission_dispatcher.cc b/content/renderer/notification_permission_dispatcher.cc
index 98a8ed0..5d170fb 100644
--- a/content/renderer/notification_permission_dispatcher.cc
+++ b/content/renderer/notification_permission_dispatcher.cc
@@ -11,7 +11,6 @@
#include "content/public/renderer/render_frame.h"
#include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
#include "third_party/WebKit/public/platform/WebString.h"
-#include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
#include "third_party/WebKit/public/web/modules/notifications/WebNotificationPermissionCallback.h"
using blink::WebNotificationPermissionCallback;
@@ -38,7 +37,6 @@ void NotificationPermissionDispatcher::RequestPermission(
// callbacks, will be deleted before the "this" instance is deleted.
permission_service_->RequestPermission(
PermissionName::NOTIFICATIONS, origin.toString().utf8(),
- blink::WebUserGestureIndicator::isProcessingUserGesture(),
base::Bind(&NotificationPermissionDispatcher::OnPermissionRequestComplete,
base::Unretained(this),
base::Passed(std::move(owned_callback))));