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 ad51088c (#444943)

Browse Source
This commit is contained in:
Marshall Greenblatt
2017-01-23 12:36:54 -05:00
parent 9d48a4f80e
commit b7b145fa4f
117 changed files with 1261 additions and 1254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,9 +201,10 @@ int CefPermissionManager::RequestPermissions(
content::WebContents::FromRenderFrameHost(render_frame_host);
GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin();
PendingRequest* pending_request = new PendingRequest(
render_frame_host, permissions, callback);
int request_id = pending_requests_.Add(pending_request);
std::unique_ptr<PendingRequest> pending_request =
base::MakeUnique<PendingRequest>(
render_frame_host, permissions, callback);
int request_id = pending_requests_.Add(std::move(pending_request));
const PermissionRequestID request(render_frame_host, request_id);
@@ -316,7 +317,7 @@ int CefPermissionManager::SubscribePermissionStatusChange(
if (subscriptions_.IsEmpty())
profile_->GetHostContentSettingsMap()->AddObserver(this);
Subscription* subscription = new Subscription();
std::unique_ptr<Subscription> subscription = base::MakeUnique<Subscription>();
subscription->permission = permission;
subscription->requesting_origin = requesting_origin;
subscription->embedding_origin = embedding_origin;
@@ -327,7 +328,7 @@ int CefPermissionManager::SubscribePermissionStatusChange(
subscription->requesting_origin,
subscription->embedding_origin));
return subscriptions_.Add(subscription);
return subscriptions_.Add(std::move(subscription));
}
void CefPermissionManager::UnsubscribePermissionStatusChange(