| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "android_webview/browser/aw_permission_manager.h" | 5 #include "android_webview/browser/aw_permission_manager.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "android_webview/browser/aw_browser_permission_request_delegate.h" | 9 #include "android_webview/browser/aw_browser_permission_request_delegate.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| 11 #include "base/containers/hash_tables.h" | 11 #include "base/containers/hash_tables.h" |
| 12 #include "base/logging.h" | 12 #include "base/logging.h" |
| 13 #include "content/public/browser/permission_type.h" | 13 #include "content/public/browser/permission_type.h" |
| 14 #include "content/public/browser/render_frame_host.h" | 14 #include "content/public/browser/render_frame_host.h" |
| 15 #include "content/public/browser/render_process_host.h" | 15 #include "content/public/browser/render_process_host.h" |
| 16 #include "content/public/browser/web_contents.h" | 16 #include "content/public/browser/web_contents.h" |
| 17 | 17 |
| 18 using blink::mojom::PermissionStatus; | 18 using blink::mojom::PermissionStatus; |
| 19 using content::PermissionType; | 19 using content::PermissionType; |
| 20 | 20 |
| 21 using RequestPermissionsCallback = |
| 22 base::Callback<void(const std::vector<PermissionStatus>&)>; |
| 23 |
| 21 namespace android_webview { | 24 namespace android_webview { |
| 22 | 25 |
| 26 namespace { |
| 27 |
| 28 void PermissionRequestResponseCallbackWrapper( |
| 29 const base::Callback<void(PermissionStatus)>& callback, |
| 30 const std::vector<PermissionStatus>& vector) { |
| 31 DCHECK_EQ(vector.size(), 1ul); |
| 32 callback.Run(vector[0]); |
| 33 } |
| 34 |
| 35 } // namespace |
| 36 |
| 23 class LastRequestResultCache { | 37 class LastRequestResultCache { |
| 24 public: | 38 public: |
| 25 LastRequestResultCache() = default; | 39 LastRequestResultCache() = default; |
| 26 | 40 |
| 27 void SetResult(PermissionType permission, | 41 void SetResult(PermissionType permission, |
| 28 const GURL& requesting_origin, | 42 const GURL& requesting_origin, |
| 29 const GURL& embedding_origin, | 43 const GURL& embedding_origin, |
| 30 PermissionStatus status) { | 44 PermissionStatus status) { |
| 31 DCHECK(status == PermissionStatus::GRANTED || | 45 DCHECK(status == PermissionStatus::GRANTED || |
| 32 status == PermissionStatus::DENIED); | 46 status == PermissionStatus::DENIED); |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 return std::string(); | 138 return std::string(); |
| 125 return requesting + "," + embedding; | 139 return requesting + "," + embedding; |
| 126 } | 140 } |
| 127 | 141 |
| 128 using StatusMap = base::hash_map<std::string, PermissionStatus>; | 142 using StatusMap = base::hash_map<std::string, PermissionStatus>; |
| 129 StatusMap pmi_result_cache_; | 143 StatusMap pmi_result_cache_; |
| 130 | 144 |
| 131 DISALLOW_COPY_AND_ASSIGN(LastRequestResultCache); | 145 DISALLOW_COPY_AND_ASSIGN(LastRequestResultCache); |
| 132 }; | 146 }; |
| 133 | 147 |
| 134 struct AwPermissionManager::PendingRequest { | 148 class AwPermissionManager::PendingRequest { |
| 135 public: | 149 public: |
| 136 PendingRequest(PermissionType permission, | 150 PendingRequest(content::RenderFrameHost* render_frame_host, |
| 151 const std::vector<PermissionType> permissions, |
| 137 GURL requesting_origin, | 152 GURL requesting_origin, |
| 138 GURL embedding_origin, | 153 GURL embedding_origin, |
| 139 content::RenderFrameHost* render_frame_host, | 154 const RequestPermissionsCallback callback) |
| 140 const base::Callback<void(PermissionStatus)>& callback) | 155 : render_process_id_(render_frame_host->GetProcess()->GetID()), |
| 141 : permission(permission), | 156 render_frame_id_(render_frame_host->GetRoutingID()), |
| 142 requesting_origin(requesting_origin), | 157 callback_(callback), |
| 143 embedding_origin(embedding_origin), | 158 permissions_(permissions), |
| 144 render_process_id(render_frame_host->GetProcess()->GetID()), | 159 results_(permissions.size(), PermissionStatus::DENIED), |
| 145 render_frame_id(render_frame_host->GetRoutingID()), | 160 remaining_results_(permissions.size()), |
| 146 callback(callback) { | 161 requesting_origin_(requesting_origin), |
| 147 } | 162 embedding_origin_(embedding_origin) {} |
| 148 | 163 |
| 149 ~PendingRequest() = default; | 164 ~PendingRequest() = default; |
| 150 | 165 |
| 151 PermissionType permission; | 166 void SetPermissionStatus(int index, PermissionStatus status) { |
| 152 GURL requesting_origin; | 167 DCHECK(!IsComplete()); |
| 153 GURL embedding_origin; | 168 |
| 154 int render_process_id; | 169 results_[index] = status; |
| 155 int render_frame_id; | 170 --remaining_results_; |
| 156 base::Callback<void(PermissionStatus)> callback; | 171 } |
| 172 |
| 173 void SetPermissionStatus(PermissionType type, PermissionStatus status) { |
| 174 for (size_t i = 0; i < permissions_.size(); ++i) { |
| 175 if (permissions_[i] == type) { |
| 176 results_[i] = status; |
| 177 --remaining_results_; |
| 178 } |
| 179 } |
| 180 } |
| 181 |
| 182 bool HasPermissionType(PermissionType type) { |
| 183 for (auto permission : permissions_) { |
| 184 if (permission == type) |
| 185 return true; |
| 186 } |
| 187 return false; |
| 188 } |
| 189 |
| 190 bool IsComplete() const { |
| 191 return remaining_results_ == 0; |
| 192 } |
| 193 |
| 194 int render_process_id() const { return render_process_id_; } |
| 195 int render_frame_id() const { return render_frame_id_; } |
| 196 |
| 197 const RequestPermissionsCallback callback() const { return callback_; } |
| 198 |
| 199 std::vector<PermissionType> permissions() const { |
| 200 return permissions_; |
| 201 } |
| 202 |
| 203 std::vector<PermissionStatus> results() const { |
| 204 return results_; |
| 205 } |
| 206 |
| 207 const GURL& requesting_origin() const { |
| 208 return requesting_origin_; |
| 209 } |
| 210 |
| 211 const GURL& embedding_origin() const { |
| 212 return embedding_origin_; |
| 213 } |
| 214 |
| 215 private: |
| 216 int render_process_id_; |
| 217 int render_frame_id_; |
| 218 RequestPermissionsCallback callback_; |
| 219 std::vector<PermissionType> permissions_; |
| 220 std::vector<PermissionStatus> results_; |
| 221 size_t remaining_results_; |
| 222 GURL requesting_origin_; |
| 223 GURL embedding_origin_; |
| 157 }; | 224 }; |
| 158 | 225 |
| 159 AwPermissionManager::AwPermissionManager() | 226 AwPermissionManager::AwPermissionManager() |
| 160 : content::PermissionManager(), | 227 : content::PermissionManager(), |
| 161 result_cache_(new LastRequestResultCache), | 228 result_cache_(new LastRequestResultCache), |
| 162 weak_ptr_factory_(this) { | 229 weak_ptr_factory_(this) { |
| 163 } | 230 } |
| 164 | 231 |
| 165 AwPermissionManager::~AwPermissionManager() { | 232 AwPermissionManager::~AwPermissionManager() { |
| 233 for (PendingRequestsMap::Iterator<PendingRequest> it(&pending_requests_); |
| 234 !it.IsAtEnd(); it.Advance()) { |
| 235 it.GetCurrentValue()->callback().Run(it.GetCurrentValue()->results()); |
| 236 } |
| 166 } | 237 } |
| 167 | 238 |
| 168 int AwPermissionManager::RequestPermission( | 239 int AwPermissionManager::RequestPermission( |
| 169 PermissionType permission, | 240 PermissionType permission, |
| 170 content::RenderFrameHost* render_frame_host, | 241 content::RenderFrameHost* render_frame_host, |
| 171 const GURL& requesting_origin, | 242 const GURL& requesting_origin, |
| 172 bool user_gesture, | 243 bool user_gesture, |
| 173 const base::Callback<void(PermissionStatus)>& callback) { | 244 const base::Callback<void(PermissionStatus)>& callback) { |
| 174 int render_process_id = render_frame_host->GetProcess()->GetID(); | 245 return RequestPermissions( |
| 175 int render_frame_id = render_frame_host->GetRoutingID(); | 246 std::vector<PermissionType>(1, permission), |
| 176 AwBrowserPermissionRequestDelegate* delegate = | 247 render_frame_host, |
| 177 AwBrowserPermissionRequestDelegate::FromID(render_process_id, | 248 requesting_origin, |
| 178 render_frame_id); | 249 user_gesture, |
| 179 if (!delegate) { | 250 base::Bind(&PermissionRequestResponseCallbackWrapper, callback)); |
| 180 DVLOG(0) << "Dropping permission request for " | |
| 181 << static_cast<int>(permission); | |
| 182 callback.Run(PermissionStatus::DENIED); | |
| 183 return kNoPendingOperation; | |
| 184 } | |
| 185 | |
| 186 // Do not delegate any requests which are already pending. | |
| 187 bool should_delegate_request = true; | |
| 188 for (PendingRequestsMap::Iterator<PendingRequest> it(&pending_requests_); | |
| 189 !it.IsAtEnd(); it.Advance()) { | |
| 190 if (permission == it.GetCurrentValue()->permission) { | |
| 191 should_delegate_request = false; | |
| 192 break; | |
| 193 } | |
| 194 } | |
| 195 | |
| 196 const GURL& embedding_origin = | |
| 197 content::WebContents::FromRenderFrameHost(render_frame_host) | |
| 198 ->GetLastCommittedURL().GetOrigin(); | |
| 199 | |
| 200 int request_id = kNoPendingOperation; | |
| 201 switch (permission) { | |
| 202 case PermissionType::GEOLOCATION: | |
| 203 request_id = pending_requests_.Add(new PendingRequest( | |
| 204 permission, requesting_origin, | |
| 205 embedding_origin, render_frame_host, | |
| 206 callback)); | |
| 207 if (should_delegate_request) { | |
| 208 delegate->RequestGeolocationPermission( | |
| 209 requesting_origin, | |
| 210 base::Bind(&OnRequestResponse, | |
| 211 weak_ptr_factory_.GetWeakPtr(), request_id, | |
| 212 callback)); | |
| 213 } | |
| 214 break; | |
| 215 case PermissionType::PROTECTED_MEDIA_IDENTIFIER: | |
| 216 request_id = pending_requests_.Add(new PendingRequest( | |
| 217 permission, requesting_origin, | |
| 218 embedding_origin, render_frame_host, | |
| 219 callback)); | |
| 220 if (should_delegate_request) { | |
| 221 delegate->RequestProtectedMediaIdentifierPermission( | |
| 222 requesting_origin, | |
| 223 base::Bind(&OnRequestResponse, | |
| 224 weak_ptr_factory_.GetWeakPtr(), request_id, | |
| 225 callback)); | |
| 226 } | |
| 227 break; | |
| 228 case PermissionType::MIDI_SYSEX: | |
| 229 request_id = pending_requests_.Add(new PendingRequest( | |
| 230 permission, requesting_origin, | |
| 231 embedding_origin, render_frame_host, | |
| 232 callback)); | |
| 233 if (should_delegate_request) { | |
| 234 delegate->RequestMIDISysexPermission( | |
| 235 requesting_origin, | |
| 236 base::Bind(&OnRequestResponse, | |
| 237 weak_ptr_factory_.GetWeakPtr(), request_id, | |
| 238 callback)); | |
| 239 } | |
| 240 break; | |
| 241 case PermissionType::AUDIO_CAPTURE: | |
| 242 case PermissionType::VIDEO_CAPTURE: | |
| 243 case PermissionType::NOTIFICATIONS: | |
| 244 case PermissionType::PUSH_MESSAGING: | |
| 245 case PermissionType::DURABLE_STORAGE: | |
| 246 case PermissionType::BACKGROUND_SYNC: | |
| 247 NOTIMPLEMENTED() << "RequestPermission is not implemented for " | |
| 248 << static_cast<int>(permission); | |
| 249 callback.Run(PermissionStatus::DENIED); | |
| 250 break; | |
| 251 case PermissionType::MIDI: | |
| 252 callback.Run(PermissionStatus::GRANTED); | |
| 253 break; | |
| 254 case PermissionType::NUM: | |
| 255 NOTREACHED() << "PermissionType::NUM was not expected here."; | |
| 256 callback.Run(PermissionStatus::DENIED); | |
| 257 break; | |
| 258 } | |
| 259 return request_id; | |
| 260 } | 251 } |
| 261 | 252 |
| 262 int AwPermissionManager::RequestPermissions( | 253 int AwPermissionManager::RequestPermissions( |
| 263 const std::vector<PermissionType>& permissions, | 254 const std::vector<PermissionType>& permissions, |
| 264 content::RenderFrameHost* render_frame_host, | 255 content::RenderFrameHost* render_frame_host, |
| 265 const GURL& requesting_origin, | 256 const GURL& requesting_origin, |
| 266 bool user_gesture, | 257 bool user_gesture, |
| 267 const base::Callback<void( | 258 const base::Callback<void( |
| 268 const std::vector<PermissionStatus>&)>& callback) { | 259 const std::vector<PermissionStatus>&)>& callback) { |
| 269 NOTIMPLEMENTED() << "RequestPermissions has not been implemented in WebView"; | 260 if (permissions.empty()) { |
| 261 callback.Run(std::vector<PermissionStatus>()); |
| 262 return kNoPendingOperation; |
| 263 } |
| 270 | 264 |
| 271 std::vector<PermissionStatus> result(permissions.size()); | 265 int render_process_id = render_frame_host->GetProcess()->GetID(); |
| 266 int render_frame_id = render_frame_host->GetRoutingID(); |
| 267 AwBrowserPermissionRequestDelegate* delegate = |
| 268 AwBrowserPermissionRequestDelegate::FromID(render_process_id, |
| 269 render_frame_id); |
| 270 if (!delegate) { |
| 271 DVLOG(0) << "Dropping permissions request"; |
| 272 callback.Run(std::vector<PermissionStatus>( |
| 273 permissions.size(), PermissionStatus::DENIED)); |
| 274 return kNoPendingOperation; |
| 275 } |
| 276 |
| 272 const GURL& embedding_origin = | 277 const GURL& embedding_origin = |
| 273 content::WebContents::FromRenderFrameHost(render_frame_host) | 278 content::WebContents::FromRenderFrameHost(render_frame_host) |
| 274 ->GetLastCommittedURL().GetOrigin(); | 279 ->GetLastCommittedURL().GetOrigin(); |
| 275 | 280 |
| 276 for (PermissionType type : permissions) { | 281 PendingRequest* pending_request = new PendingRequest( |
| 277 result.push_back(GetPermissionStatus( | 282 render_frame_host, |
| 278 type, requesting_origin, embedding_origin)); | 283 permissions, |
| 284 requesting_origin, |
| 285 embedding_origin, |
| 286 callback); |
| 287 int request_id = pending_requests_.Add(pending_request); |
| 288 |
| 289 for (size_t i = 0; i < permissions.size(); ++i) { |
| 290 bool should_delegate_request = true; |
| 291 for (PendingRequestsMap::Iterator<PendingRequest> it(&pending_requests_); |
| 292 !it.IsAtEnd(); it.Advance()) { |
| 293 if (it.GetCurrentValue()->HasPermissionType(permissions[i])) { |
| 294 // TODO(toyoshim): Shall we check to match requesting_origin too? |
| 295 should_delegate_request = false; |
| 296 break; |
| 297 } |
| 298 } |
| 299 if (!should_delegate_request) |
| 300 continue; |
| 301 |
| 302 switch (permissions[i]) { |
| 303 case PermissionType::GEOLOCATION: |
| 304 delegate->RequestGeolocationPermission( |
| 305 requesting_origin, |
| 306 base::Bind(&OnRequestResponse, |
| 307 weak_ptr_factory_.GetWeakPtr(), request_id, i)); |
| 308 break; |
| 309 case PermissionType::PROTECTED_MEDIA_IDENTIFIER: |
| 310 delegate->RequestProtectedMediaIdentifierPermission( |
| 311 requesting_origin, |
| 312 base::Bind(&OnRequestResponse, |
| 313 weak_ptr_factory_.GetWeakPtr(), request_id, i)); |
| 314 break; |
| 315 case PermissionType::MIDI_SYSEX: |
| 316 delegate->RequestMIDISysexPermission( |
| 317 requesting_origin, |
| 318 base::Bind(&OnRequestResponse, |
| 319 weak_ptr_factory_.GetWeakPtr(), request_id, i)); |
| 320 break; |
| 321 case PermissionType::AUDIO_CAPTURE: |
| 322 case PermissionType::VIDEO_CAPTURE: |
| 323 case PermissionType::NOTIFICATIONS: |
| 324 case PermissionType::PUSH_MESSAGING: |
| 325 case PermissionType::DURABLE_STORAGE: |
| 326 case PermissionType::BACKGROUND_SYNC: |
| 327 NOTIMPLEMENTED() << "RequestPermissions is not implemented for " |
| 328 << static_cast<int>(permissions[i]); |
| 329 pending_request->SetPermissionStatus(i, PermissionStatus::DENIED); |
| 330 break; |
| 331 case PermissionType::MIDI: |
| 332 pending_request->SetPermissionStatus(i, PermissionStatus::GRANTED); |
| 333 break; |
| 334 case PermissionType::NUM: |
| 335 NOTREACHED() << "PermissionType::NUM was not expected here."; |
| 336 pending_request->SetPermissionStatus(i, PermissionStatus::DENIED); |
| 337 break; |
| 338 } |
| 279 } | 339 } |
| 280 | 340 return request_id; |
| 281 callback.Run(result); | |
| 282 return kNoPendingOperation; | |
| 283 } | 341 } |
| 284 | 342 |
| 285 // static | 343 // static |
| 286 void AwPermissionManager::OnRequestResponse( | 344 void AwPermissionManager::OnRequestResponse( |
| 287 const base::WeakPtr<AwPermissionManager>& manager, | 345 const base::WeakPtr<AwPermissionManager>& manager, |
| 288 int request_id, | 346 int request_id, |
| 289 const base::Callback<void(PermissionStatus)>& callback, | 347 int request_index, |
| 290 bool allowed) { | 348 bool allowed) { |
| 349 if (!manager.get()) |
| 350 return; |
| 351 |
| 291 PermissionStatus status = | 352 PermissionStatus status = |
| 292 allowed ? PermissionStatus::GRANTED : PermissionStatus::DENIED; | 353 allowed ? PermissionStatus::GRANTED : PermissionStatus::DENIED; |
| 293 if (manager.get()) { | 354 PendingRequest* pending_request = |
| 294 PendingRequest* pending_request = | 355 manager->pending_requests_.Lookup(request_id); |
| 295 manager->pending_requests_.Lookup(request_id); | 356 PermissionType permission_type = |
| 357 pending_request->permissions()[request_index]; |
| 296 | 358 |
| 297 for (PendingRequestsMap::Iterator<PendingRequest> it( | 359 manager->result_cache_->SetResult( |
| 298 &manager->pending_requests_); | 360 permission_type, |
| 299 !it.IsAtEnd(); it.Advance()) { | 361 pending_request->requesting_origin(), |
| 300 if (pending_request->permission == it.GetCurrentValue()->permission && | 362 pending_request->embedding_origin(), |
| 301 it.GetCurrentKey() != request_id) { | 363 status); |
| 302 it.GetCurrentValue()->callback.Run(status); | 364 |
| 303 manager->pending_requests_.Remove(it.GetCurrentKey()); | 365 std::vector<int> complete_request_ids; |
| 304 } | 366 std::vector<std::pair<const RequestPermissionsCallback, |
| 367 std::vector<PermissionStatus>>> complete_request_pairs; |
| 368 for (PendingRequestsMap::Iterator<PendingRequest> it( |
| 369 &manager->pending_requests_); |
| 370 !it.IsAtEnd(); it.Advance()) { |
| 371 it.GetCurrentValue()->SetPermissionStatus(permission_type, status); |
| 372 if (it.GetCurrentValue()->IsComplete()) { |
| 373 complete_request_ids.push_back(it.GetCurrentKey()); |
| 374 complete_request_pairs.push_back( |
| 375 std::make_pair(it.GetCurrentValue()->callback(), |
| 376 it.GetCurrentValue()->results())); |
| 305 } | 377 } |
| 306 | |
| 307 manager->result_cache_->SetResult( | |
| 308 pending_request->permission, | |
| 309 pending_request->requesting_origin, | |
| 310 pending_request->embedding_origin, | |
| 311 status); | |
| 312 manager->pending_requests_.Remove(request_id); | |
| 313 } | 378 } |
| 314 callback.Run(status); | 379 for (auto id : complete_request_ids) |
| 380 manager->pending_requests_.Remove(id); |
| 381 for (auto pair : complete_request_pairs) |
| 382 pair.first.Run(pair.second); |
| 315 } | 383 } |
| 316 | 384 |
| 317 void AwPermissionManager::CancelPermissionRequest(int request_id) { | 385 void AwPermissionManager::CancelPermissionRequest(int request_id) { |
| 318 PendingRequest* pending_request = pending_requests_.Lookup(request_id); | 386 PendingRequest* pending_request = pending_requests_.Lookup(request_id); |
| 319 if (!pending_request) | 387 if (!pending_request) |
| 320 return; | 388 return; |
| 321 | 389 |
| 322 content::RenderFrameHost* render_frame_host = | |
| 323 content::RenderFrameHost::FromID(pending_request->render_process_id, | |
| 324 pending_request->render_frame_id); | |
| 325 content::WebContents* web_contents = | |
| 326 content::WebContents::FromRenderFrameHost(render_frame_host); | |
| 327 DCHECK(web_contents); | |
| 328 | |
| 329 // The caller is canceling (presumably) the most recent request. Assuming the | 390 // The caller is canceling (presumably) the most recent request. Assuming the |
| 330 // request did not complete, the user did not respond to the requset. | 391 // request did not complete, the user did not respond to the requset. |
| 331 // Thus, assume we do not know the result. | 392 // Thus, assume we do not know the result. |
| 332 const GURL& embedding_origin = web_contents | 393 const GURL& embedding_origin = pending_request->embedding_origin(); |
| 333 ->GetLastCommittedURL().GetOrigin(); | 394 const GURL& requesting_origin = pending_request->requesting_origin(); |
| 334 result_cache_->ClearResult( | 395 for (auto permission : pending_request->permissions()) { |
| 335 pending_request->permission, | 396 result_cache_->ClearResult( |
| 336 pending_request->requesting_origin, | 397 permission, |
| 337 embedding_origin); | 398 requesting_origin, |
| 399 embedding_origin); |
| 400 } |
| 338 | 401 |
| 339 AwBrowserPermissionRequestDelegate* delegate = | 402 AwBrowserPermissionRequestDelegate* delegate = |
| 340 AwBrowserPermissionRequestDelegate::FromID( | 403 AwBrowserPermissionRequestDelegate::FromID( |
| 341 pending_request->render_process_id, | 404 pending_request->render_process_id(), |
| 342 pending_request->render_frame_id); | 405 pending_request->render_frame_id()); |
| 343 if (!delegate) { | 406 if (!delegate) { |
| 344 pending_requests_.Remove(request_id); | 407 pending_requests_.Remove(request_id); |
| 345 return; | 408 return; |
| 346 } | 409 } |
| 347 | 410 |
| 348 switch (pending_request->permission) { | 411 for (auto permission : pending_request->permissions()) { |
| 349 case PermissionType::GEOLOCATION: | 412 switch (permission) { |
| 350 delegate->CancelGeolocationPermissionRequests( | 413 case PermissionType::GEOLOCATION: |
| 351 pending_request->requesting_origin); | 414 delegate->CancelGeolocationPermissionRequests( |
| 352 break; | 415 requesting_origin); |
| 353 case PermissionType::PROTECTED_MEDIA_IDENTIFIER: | 416 break; |
| 354 delegate->CancelProtectedMediaIdentifierPermissionRequests( | 417 case PermissionType::PROTECTED_MEDIA_IDENTIFIER: |
| 355 pending_request->requesting_origin); | 418 delegate->CancelProtectedMediaIdentifierPermissionRequests( |
| 356 break; | 419 requesting_origin); |
| 357 case PermissionType::MIDI_SYSEX: | 420 break; |
| 358 delegate->CancelMIDISysexPermissionRequests( | 421 case PermissionType::MIDI_SYSEX: |
| 359 pending_request->requesting_origin); | 422 delegate->CancelMIDISysexPermissionRequests( |
| 360 break; | 423 requesting_origin); |
| 361 case PermissionType::NOTIFICATIONS: | 424 break; |
| 362 case PermissionType::PUSH_MESSAGING: | 425 case PermissionType::NOTIFICATIONS: |
| 363 case PermissionType::DURABLE_STORAGE: | 426 case PermissionType::PUSH_MESSAGING: |
| 364 case PermissionType::AUDIO_CAPTURE: | 427 case PermissionType::DURABLE_STORAGE: |
| 365 case PermissionType::VIDEO_CAPTURE: | 428 case PermissionType::AUDIO_CAPTURE: |
| 366 case PermissionType::BACKGROUND_SYNC: | 429 case PermissionType::VIDEO_CAPTURE: |
| 367 NOTIMPLEMENTED() << "CancelPermission not implemented for " | 430 case PermissionType::BACKGROUND_SYNC: |
| 368 << static_cast<int>(pending_request->permission); | 431 NOTIMPLEMENTED() << "CancelPermission not implemented for " |
| 369 break; | 432 << static_cast<int>(permission); |
| 370 case PermissionType::MIDI: | 433 break; |
| 371 // There is nothing to cancel so this is simply ignored. | 434 case PermissionType::MIDI: |
| 372 break; | 435 // There is nothing to cancel so this is simply ignored. |
| 373 case PermissionType::NUM: | 436 break; |
| 374 NOTREACHED() << "PermissionType::NUM was not expected here."; | 437 case PermissionType::NUM: |
| 375 break; | 438 NOTREACHED() << "PermissionType::NUM was not expected here."; |
| 439 break; |
| 440 } |
| 441 pending_requests_.Remove(request_id); |
| 376 } | 442 } |
| 377 | |
| 378 pending_requests_.Remove(request_id); | |
| 379 } | 443 } |
| 380 | 444 |
| 381 void AwPermissionManager::ResetPermission(PermissionType permission, | 445 void AwPermissionManager::ResetPermission(PermissionType permission, |
| 382 const GURL& requesting_origin, | 446 const GURL& requesting_origin, |
| 383 const GURL& embedding_origin) { | 447 const GURL& embedding_origin) { |
| 384 result_cache_->ClearResult(permission, requesting_origin, embedding_origin); | 448 result_cache_->ClearResult(permission, requesting_origin, embedding_origin); |
| 385 } | 449 } |
| 386 | 450 |
| 387 PermissionStatus AwPermissionManager::GetPermissionStatus( | 451 PermissionStatus AwPermissionManager::GetPermissionStatus( |
| 388 PermissionType permission, | 452 PermissionType permission, |
| (...skipping 22 matching lines...) Expand all Loading... |
| 411 const GURL& embedding_origin, | 475 const GURL& embedding_origin, |
| 412 const base::Callback<void(PermissionStatus)>& callback) { | 476 const base::Callback<void(PermissionStatus)>& callback) { |
| 413 return kNoPendingOperation; | 477 return kNoPendingOperation; |
| 414 } | 478 } |
| 415 | 479 |
| 416 void AwPermissionManager::UnsubscribePermissionStatusChange( | 480 void AwPermissionManager::UnsubscribePermissionStatusChange( |
| 417 int subscription_id) { | 481 int subscription_id) { |
| 418 } | 482 } |
| 419 | 483 |
| 420 } // namespace android_webview | 484 } // namespace android_webview |
| OLD | NEW |