diff options
| author | tfarina <tfarina@chromium.org> | 2015-10-26 15:17:49 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-26 22:18:31 +0000 |
| commit | 166199081e69bf582a4d75339827a81563bfc0c2 (patch) | |
| tree | 9d7e65f8013f6b41ce1229877c7225d9a2099c23 /blimp | |
| parent | fbbed92bc4db389ecf0f751a8d6917b4bd86bff8 (diff) | |
| download | chromium_src-166199081e69bf582a4d75339827a81563bfc0c2.zip chromium_src-166199081e69bf582a4d75339827a81563bfc0c2.tar.gz chromium_src-166199081e69bf582a4d75339827a81563bfc0c2.tar.bz2 | |
blimp: Override RequestPermissions in BlimpPermissionManager.
content::PermissionManager is an abstract class, i.e. contains only pure
virtual methods and thus all methods should be overridden otherwise
things won't compile.
BUG=None
R=kmarshall@chromium.org,dtrainor@chromium.org
Review URL: https://codereview.chromium.org/1409073008
Cr-Commit-Position: refs/heads/master@{#356149}
Diffstat (limited to 'blimp')
| -rw-r--r-- | blimp/engine/browser/blimp_permission_manager.cc | 10 | ||||
| -rw-r--r-- | blimp/engine/browser/blimp_permission_manager.h | 7 |
2 files changed, 17 insertions, 0 deletions
diff --git a/blimp/engine/browser/blimp_permission_manager.cc b/blimp/engine/browser/blimp_permission_manager.cc index 6cace1b..499f028 100644 --- a/blimp/engine/browser/blimp_permission_manager.cc +++ b/blimp/engine/browser/blimp_permission_manager.cc @@ -25,6 +25,16 @@ int BlimpPermissionManager::RequestPermission( return kNoPendingOperation; } +int BlimpPermissionManager::RequestPermissions( + const std::vector<content::PermissionType>& permission, + content::RenderFrameHost* render_frame_host, + const GURL& requesting_origin, + bool user_gesture, + const base::Callback<void(const std::vector<content::PermissionStatus>&)>& + callback) { + return kNoPendingOperation; +} + void BlimpPermissionManager::CancelPermissionRequest(int request_id) {} void BlimpPermissionManager::ResetPermission(content::PermissionType permission, diff --git a/blimp/engine/browser/blimp_permission_manager.h b/blimp/engine/browser/blimp_permission_manager.h index b9f0eb8..5ab2beb 100644 --- a/blimp/engine/browser/blimp_permission_manager.h +++ b/blimp/engine/browser/blimp_permission_manager.h @@ -24,6 +24,13 @@ class BlimpPermissionManager : public content::PermissionManager { const GURL& requesting_origin, bool user_gesture, const base::Callback<void(content::PermissionStatus)>& callback) override; + int RequestPermissions( + const std::vector<content::PermissionType>& permission, + content::RenderFrameHost* render_frame_host, + const GURL& requesting_origin, + bool user_gesture, + const base::Callback<void(const std::vector<content::PermissionStatus>&)>& + callback) override; void CancelPermissionRequest(int request_id) override; void ResetPermission(content::PermissionType permission, const GURL& requesting_origin, |