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

Side by Side Diff: android_webview/browser/aw_content_browser_client.cc

Issue 881023002: media: Rename PERMISSION_PROTECTED_MEDIA to PERMISSION_PROTECTED_MEDIA_IDENTIFIER. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_content_browser_client.h" 5 #include "android_webview/browser/aw_content_browser_client.h"
6 6
7 #include "android_webview/browser/aw_browser_context.h" 7 #include "android_webview/browser/aw_browser_context.h"
8 #include "android_webview/browser/aw_browser_main_parts.h" 8 #include "android_webview/browser/aw_browser_main_parts.h"
9 #include "android_webview/browser/aw_browser_permission_request_delegate.h" 9 #include "android_webview/browser/aw_browser_permission_request_delegate.h"
10 #include "android_webview/browser/aw_contents_client_bridge_base.h" 10 #include "android_webview/browser/aw_contents_client_bridge_base.h"
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 render_view_id); 392 render_view_id);
393 switch (permission) { 393 switch (permission) {
394 case content::PERMISSION_GEOLOCATION: 394 case content::PERMISSION_GEOLOCATION:
395 if (!delegate) { 395 if (!delegate) {
396 DVLOG(0) << "Dropping GeolocationPermission request"; 396 DVLOG(0) << "Dropping GeolocationPermission request";
397 result_callback.Run(false); 397 result_callback.Run(false);
398 return; 398 return;
399 } 399 }
400 delegate->RequestGeolocationPermission(origin, result_callback); 400 delegate->RequestGeolocationPermission(origin, result_callback);
401 break; 401 break;
402 case content::PERMISSION_PROTECTED_MEDIA: 402 case content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER:
403 if (!delegate) { 403 if (!delegate) {
404 DVLOG(0) << "Dropping ProtectedMediaIdentifierPermission request"; 404 DVLOG(0) << "Dropping ProtectedMediaIdentifierPermission request";
405 result_callback.Run(false); 405 result_callback.Run(false);
406 return; 406 return;
407 } 407 }
408 delegate->RequestProtectedMediaIdentifierPermission(origin, 408 delegate->RequestProtectedMediaIdentifierPermission(origin,
409 result_callback); 409 result_callback);
410 break; 410 break;
411 case content::PERMISSION_MIDI_SYSEX: 411 case content::PERMISSION_MIDI_SYSEX:
412 case content::PERMISSION_NOTIFICATIONS: 412 case content::PERMISSION_NOTIFICATIONS:
(...skipping 16 matching lines...) Expand all
429 int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID(); 429 int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID();
430 AwBrowserPermissionRequestDelegate* delegate = 430 AwBrowserPermissionRequestDelegate* delegate =
431 AwBrowserPermissionRequestDelegate::FromID(render_process_id, 431 AwBrowserPermissionRequestDelegate::FromID(render_process_id,
432 render_view_id); 432 render_view_id);
433 if (!delegate) 433 if (!delegate)
434 return; 434 return;
435 switch (permission) { 435 switch (permission) {
436 case content::PERMISSION_GEOLOCATION: 436 case content::PERMISSION_GEOLOCATION:
437 delegate->CancelGeolocationPermissionRequests(origin); 437 delegate->CancelGeolocationPermissionRequests(origin);
438 break; 438 break;
439 case content::PERMISSION_PROTECTED_MEDIA: 439 case content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER:
440 delegate->CancelProtectedMediaIdentifierPermissionRequests(origin); 440 delegate->CancelProtectedMediaIdentifierPermissionRequests(origin);
441 break; 441 break;
442 case content::PERMISSION_MIDI_SYSEX: 442 case content::PERMISSION_MIDI_SYSEX:
443 case content::PERMISSION_NOTIFICATIONS: 443 case content::PERMISSION_NOTIFICATIONS:
444 case content::PERMISSION_PUSH_MESSAGING: 444 case content::PERMISSION_PUSH_MESSAGING:
445 NOTIMPLEMENTED() << "CancelPermission not implemented for " << permission; 445 NOTIMPLEMENTED() << "CancelPermission not implemented for " << permission;
446 break; 446 break;
447 case content::PERMISSION_NUM: 447 case content::PERMISSION_NUM:
448 NOTREACHED() << "Invalid CancelPermission for " << permission; 448 NOTREACHED() << "Invalid CancelPermission for " << permission;
449 break; 449 break;
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); 553 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents);
554 } 554 }
555 #endif 555 #endif
556 556
557 content::DevToolsManagerDelegate* 557 content::DevToolsManagerDelegate*
558 AwContentBrowserClient::GetDevToolsManagerDelegate() { 558 AwContentBrowserClient::GetDevToolsManagerDelegate() {
559 return new AwDevToolsManagerDelegate(); 559 return new AwDevToolsManagerDelegate();
560 } 560 }
561 561
562 } // namespace android_webview 562 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698