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

Unified Diff: third_party/WebKit/Source/modules/quota/StorageManager.h

Issue 2108003002: Merge //content/child/permissions into Blink's permissions module. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing presubmits. 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/quota/StorageManager.h
diff --git a/third_party/WebKit/Source/modules/quota/StorageManager.h b/third_party/WebKit/Source/modules/quota/StorageManager.h
index 79e40961423dabe0f0acbac3c66bafe91668449c..b0e52d4322eac5bba9ec3155f60630f2446d418a 100644
--- a/third_party/WebKit/Source/modules/quota/StorageManager.h
+++ b/third_party/WebKit/Source/modules/quota/StorageManager.h
@@ -7,20 +7,32 @@
#include "bindings/core/v8/ScriptWrappable.h"
#include "platform/heap/Heap.h"
+#include "public/platform/modules/permissions/permission.mojom-blink.h"
namespace blink {
+class ExecutionContext;
class ScriptPromise;
+class ScriptPromiseResolver;
class ScriptState;
-class StorageManager final : public GarbageCollected<StorageManager>, public ScriptWrappable {
-DEFINE_WRAPPERTYPEINFO();
+class StorageManager final
+ : public GarbageCollectedFinalized<StorageManager>
mlamouri (slow - plz ping) 2016/07/18 10:25:57 Do you need this change? If I understand correctly
Reilly Grant (use Gerrit) 2016/07/19 20:10:28 InterfacePtr's destructor is non-trivial as it des
+ , public ScriptWrappable {
+ DEFINE_WRAPPERTYPEINFO();
public:
ScriptPromise persisted(ScriptState*);
ScriptPromise persist(ScriptState*);
ScriptPromise estimate(ScriptState*);
DECLARE_TRACE();
+
+private:
+ mojom::blink::PermissionService* getPermissionService(ExecutionContext*);
+ void permissionServiceConnectionError();
+ void permissionRequestComplete(ScriptPromiseResolver*, mojom::blink::PermissionStatus);
+
+ mojom::blink::PermissionServicePtr m_permissionService;
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698