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

Unified Diff: content/child/permissions/permission_dispatcher.h

Issue 1057453004: Permissions: glue between Mojo and Blink for permission observing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review commetns Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/child/permissions/permission_dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/permissions/permission_dispatcher.h
diff --git a/content/child/permissions/permission_dispatcher.h b/content/child/permissions/permission_dispatcher.h
index 6066c44b7228ddb2f81f06fd444f11555c59c582..17410e6b8214f7509447a29d901613d379d2e53f 100644
--- a/content/child/permissions/permission_dispatcher.h
+++ b/content/child/permissions/permission_dispatcher.h
@@ -7,10 +7,11 @@
#include <string>
-#include "base/compiler_specific.h"
+#include "base/callback_forward.h"
#include "base/id_map.h"
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
+#include "content/child/permissions/permission_observers_registry.h"
#include "content/common/permission_service.mojom.h"
#include "third_party/WebKit/public/platform/modules/permissions/WebPermissionClient.h"
@@ -23,8 +24,13 @@ class ServiceRegistry;
// from workers and frames independently. When called outside of the main
// thread, QueryPermissionForWorker is meant to be called. It will handle the
// thread jumping.
-class PermissionDispatcher : public blink::WebPermissionClient {
+class PermissionDispatcher : public blink::WebPermissionClient,
+ public PermissionObserversRegistry {
public:
+ // Returns whether the given WebPermissionType is observable. Some types have
+ // static values that never changes.
+ static bool IsObservable(blink::WebPermissionType type);
+
// The caller must guarantee that |service_registry| will have a lifetime
// larger than this instance of PermissionDispatcher.
explicit PermissionDispatcher(ServiceRegistry* service_registry);
@@ -34,25 +40,57 @@ class PermissionDispatcher : public blink::WebPermissionClient {
virtual void queryPermission(blink::WebPermissionType type,
const blink::WebURL& origin,
blink::WebPermissionQueryCallback* callback);
+ virtual void startListening(blink::WebPermissionType type,
+ const blink::WebURL& origin,
+ blink::WebPermissionObserver* observer);
+ virtual void stopListening(blink::WebPermissionObserver* observer);
+ // The following methods must be called by workers on the main thread.
void QueryPermissionForWorker(blink::WebPermissionType type,
const std::string& origin,
blink::WebPermissionQueryCallback* callback,
int worker_thread_id);
+ void StartListeningForWorker(
+ blink::WebPermissionType type,
+ const std::string& origin,
+ int worker_thread_id,
+ const base::Callback<void(blink::WebPermissionStatus)>& callback);
+ void GetNextPermissionChangeForWorker(
+ blink::WebPermissionType type,
+ const std::string& origin,
+ blink::WebPermissionStatus status,
+ int worker_thread_id,
+ const base::Callback<void(blink::WebPermissionStatus)>& callback);
+
+ private:
+ // Runs the given |callback| with |status| as a parameter. It has to be run
+ // on a worker thread.
+ static void RunCallbackOnWorkerThread(
+ blink::WebPermissionQueryCallback* callback,
+ scoped_ptr<blink::WebPermissionStatus> status);
+
+ // Helper method that returns an initialized PermissionServicePtr.
+ PermissionServicePtr& GetPermissionServicePtr();
- protected:
void QueryPermissionInternal(blink::WebPermissionType type,
const std::string& origin,
blink::WebPermissionQueryCallback* callback,
int worker_thread_id);
void OnQueryPermission(int request_id, PermissionStatus status);
-
- // Called from the main thread in order to run the callback in the thread it
- // was created on.
- static void RunCallbackOnWorkerThread(
- blink::WebPermissionQueryCallback* callback,
- scoped_ptr<blink::WebPermissionStatus> status);
+ void OnPermissionChanged(blink::WebPermissionType type,
+ const std::string& origin,
+ blink::WebPermissionObserver* observer,
+ PermissionStatus status);
+ void OnPermissionChangedForWorker(
+ int worker_thread_id,
+ const base::Callback<void(blink::WebPermissionStatus)>& callback,
+ PermissionStatus status);
+
+ void GetNextPermissionChange(blink::WebPermissionType type,
+ const std::string& origin,
+ blink::WebPermissionObserver* observer,
+ PermissionStatus current_status);
// Saves some basic information about the callback in order to be able to run
// it in the right thread.
« no previous file with comments | « no previous file | content/child/permissions/permission_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698