bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 6e53600d (#386251)

Browse Source 
- Remove |accept_lang| parameter from CefJSDialogHandler::OnJSDialog
  and CefFormatUrlForSecurityDisplay (see https://crbug.com/336973#c36).
- Remove remaining NPAPI-related code including functions from
  cef_web_plugin.h (see https://crbug.com/493212#c55).
- Mac: 10.7+ deployment target is now required for client applications.
- Mac: Remove CefBrowserHost::SetWindowVisibility (issue #1375). No
  replacement is required for windowed rendering. Use WasHidden for
  off-screen rendering.
- Windows: Visual Studio 2015 Update 2 is now required when building
  CEF/Chromium.
This commit is contained in:
Marshall Greenblatt
2016-04-27 16:38:52 -04:00
parent 3c957f9257
commit e7ddc933c9
215 changed files with 869 additions and 1537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libcef/browser/permissions/permission_manager.cc
View File

@@ -14,7 +14,7 @@
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/web_contents.h"
using content::PermissionStatus;
using blink::mojom::PermissionStatus;
using content::PermissionType;
namespace {
@@ -24,11 +24,11 @@ PermissionStatus ContentSettingToPermissionStatus(ContentSetting setting) {
switch (setting) {
case CONTENT_SETTING_ALLOW:
case CONTENT_SETTING_SESSION_ONLY:
return content::PermissionStatus::GRANTED;
return PermissionStatus::GRANTED;
case CONTENT_SETTING_BLOCK:
return content::PermissionStatus::DENIED;
return PermissionStatus::DENIED;
case CONTENT_SETTING_ASK:
return content::PermissionStatus::ASK;
return PermissionStatus::ASK;
case CONTENT_SETTING_DETECT_IMPORTANT_CONTENT:
case CONTENT_SETTING_DEFAULT:
case CONTENT_SETTING_NUM_SETTINGS:
@@ -36,17 +36,17 @@ PermissionStatus ContentSettingToPermissionStatus(ContentSetting setting) {
}
NOTREACHED();
return content::PermissionStatus::DENIED;
return PermissionStatus::DENIED;
}
// Helper method to convert PermissionStatus to ContentSetting.
ContentSetting PermissionStatusToContentSetting(PermissionStatus status) {
switch (status) {
case content::PermissionStatus::GRANTED:
case PermissionStatus::GRANTED:
return CONTENT_SETTING_ALLOW;
case content::PermissionStatus::DENIED:
case PermissionStatus::DENIED:
return CONTENT_SETTING_BLOCK;
case content::PermissionStatus::ASK:
case PermissionStatus::ASK:
return CONTENT_SETTING_ASK;
}
@@ -112,7 +112,7 @@ class CefPermissionManager::PendingRequest {
render_frame_id_(render_frame_host->GetRoutingID()),
callback_(callback),
permissions_(permissions),
results_(permissions.size(), content::PermissionStatus::DENIED),
results_(permissions.size(), PermissionStatus::DENIED),
remaining_results_(permissions.size()) {
}
@@ -283,7 +283,7 @@ PermissionStatus CefPermissionManager::GetPermissionStatus(
return GetPermissionStatusForConstantPermission(permission);
if (!context_.SupportsPermission(permission))
return content::PermissionStatus::DENIED;
return PermissionStatus::DENIED;
return ContentSettingToPermissionStatus(
context_.GetPermissionStatus(permission, requesting_origin,