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

Apply clang-format to all C, C++ and ObjC files (issue #2171)

Browse Source
This commit is contained in:
Marshall Greenblatt
2017-05-17 11:29:28 +02:00
parent a566549e04
commit 31d9407ee2
1331 changed files with 33014 additions and 32258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
libcef/browser/permissions/permission_context.cc
View File

@@ -35,22 +35,20 @@ class CefGeolocationCallbackImpl : public CefGeolocationCallback {
if (CEF_CURRENTLY_ON_UIT()) {
if (!callback_.is_null()) {
if (allow) {
device::GeolocationProvider::GetInstance()->
UserDidOptIntoLocationServices();
device::GeolocationProvider::GetInstance()
->UserDidOptIntoLocationServices();
}
callback_.Run(allow ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
callback_.Reset();
}
} else {
CEF_POST_TASK(CEF_UIT,
base::Bind(&CefGeolocationCallbackImpl::Continue, this, allow));
CEF_POST_TASK(CEF_UIT, base::Bind(&CefGeolocationCallbackImpl::Continue,
this, allow));
}
}
void Disconnect() {
callback_.Reset();
}
void Disconnect() { callback_.Reset(); }
private:
CallbackType callback_;
@@ -62,9 +60,7 @@ class CefGeolocationCallbackImpl : public CefGeolocationCallback {
} // namespace
CefPermissionContext::CefPermissionContext(CefBrowserContext* profile)
: profile_(profile),
weak_ptr_factory_(this) {
}
: profile_(profile), weak_ptr_factory_(this) {}
bool CefPermissionContext::SupportsPermission(
content::PermissionType permission) {
@@ -80,12 +76,8 @@ void CefPermissionContext::RequestPermission(
const BrowserPermissionCallback& callback) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
DecidePermission(permission,
web_contents,
id,
requesting_frame.GetOrigin(),
web_contents->GetLastCommittedURL().GetOrigin(),
callback);
DecidePermission(permission, web_contents, id, requesting_frame.GetOrigin(),
web_contents->GetLastCommittedURL().GetOrigin(), callback);
}
void CefPermissionContext::CancelPermissionRequest(
@@ -108,16 +100,14 @@ void CefPermissionContext::CancelPermissionRequest(
}
}
void CefPermissionContext::ResetPermission(
content::PermissionType permission,
const GURL& requesting_origin,
const GURL& embedding_origin) {
void CefPermissionContext::ResetPermission(content::PermissionType permission,
const GURL& requesting_origin,
const GURL& embedding_origin) {
profile_->GetHostContentSettingsMap()->SetContentSettingCustomScope(
ContentSettingsPattern::FromURLNoWildcard(requesting_origin),
ContentSettingsPattern::FromURLNoWildcard(embedding_origin),
permission_util::PermissionTypeToContentSetting(permission),
std::string(),
CONTENT_SETTING_DEFAULT);
std::string(), CONTENT_SETTING_DEFAULT);
}
ContentSetting CefPermissionContext::GetPermissionStatus(
@@ -130,8 +120,7 @@ ContentSetting CefPermissionContext::GetPermissionStatus(
}
return profile_->GetHostContentSettingsMap()->GetContentSetting(
requesting_origin,
embedding_origin,
requesting_origin, embedding_origin,
permission_util::PermissionTypeToContentSetting(permission),
std::string());
}
@@ -160,8 +149,7 @@ void CefPermissionContext::DecidePermission(
ContentSetting content_setting =
profile_->GetHostContentSettingsMap()->GetContentSetting(
requesting_origin,
embedding_origin,
requesting_origin, embedding_origin,
permission_util::PermissionTypeToContentSetting(permission),
std::string());
@@ -172,12 +160,11 @@ void CefPermissionContext::DecidePermission(
return;
}
QueryPermission(
permission, id, requesting_origin, embedding_origin,
base::Bind(&CefPermissionContext::NotifyPermissionSet,
weak_ptr_factory_.GetWeakPtr(), permission, id,
requesting_origin, embedding_origin, callback,
false /* persist */));
QueryPermission(permission, id, requesting_origin, embedding_origin,
base::Bind(&CefPermissionContext::NotifyPermissionSet,
weak_ptr_factory_.GetWeakPtr(), permission, id,
requesting_origin, embedding_origin, callback,
false /* persist */));
}
void CefPermissionContext::QueryPermission(
@@ -259,6 +246,5 @@ void CefPermissionContext::UpdateContentSetting(
ContentSettingsPattern::FromURLNoWildcard(requesting_origin),
ContentSettingsPattern::FromURLNoWildcard(embedding_origin),
permission_util::PermissionTypeToContentSetting(permission),
std::string(),
content_setting);
std::string(), content_setting);
}

11
libcef/browser/permissions/permission_context.h
View File

@@ -81,11 +81,10 @@ class CefPermissionContext {
ContentSetting content_setting);
// Store the decided permission as a content setting.
void UpdateContentSetting(
content::PermissionType permission,
const GURL& requesting_origin,
const GURL& embedding_origin,
ContentSetting content_setting);
void UpdateContentSetting(content::PermissionType permission,
const GURL& requesting_origin,
const GURL& embedding_origin,
ContentSetting content_setting);
CefBrowserContext* profile_;
@@ -94,4 +93,4 @@ class CefPermissionContext {
DISALLOW_COPY_AND_ASSIGN(CefPermissionContext);
};
#endif // CEF_LIBCEF_BROWSER_PERMISSIONS_PERMISSION_CONTEXT_H_
#endif // CEF_LIBCEF_BROWSER_PERMISSIONS_PERMISSION_CONTEXT_H_

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

@@ -104,17 +104,17 @@ PermissionStatus GetPermissionStatusForConstantPermission(PermissionType type) {
class CefPermissionManager::PendingRequest {
public:
PendingRequest(content::RenderFrameHost* render_frame_host,
const std::vector<PermissionType> permissions,
const base::Callback<void(
const std::vector<PermissionStatus>&)>& callback)
: render_process_id_(render_frame_host->GetProcess()->GetID()),
render_frame_id_(render_frame_host->GetRoutingID()),
callback_(callback),
permissions_(permissions),
results_(permissions.size(), PermissionStatus::DENIED),
remaining_results_(permissions.size()) {
}
PendingRequest(
content::RenderFrameHost* render_frame_host,
const std::vector<PermissionType> permissions,
const base::Callback<void(const std::vector<PermissionStatus>&)>&
callback)
: render_process_id_(render_frame_host->GetProcess()->GetID()),
render_frame_id_(render_frame_host->GetRoutingID()),
callback_(callback),
permissions_(permissions),
results_(permissions.size(), PermissionStatus::DENIED),
remaining_results_(permissions.size()) {}
void SetPermissionStatus(int permission_id, PermissionStatus status) {
DCHECK(!IsComplete());
@@ -123,25 +123,19 @@ class CefPermissionManager::PendingRequest {
--remaining_results_;
}
bool IsComplete() const {
return remaining_results_ == 0;
}
bool IsComplete() const { return remaining_results_ == 0; }
int render_process_id() const { return render_process_id_; }
int render_frame_id() const { return render_frame_id_; }
const base::Callback<void(const std::vector<PermissionStatus>&)>
callback() const {
const base::Callback<void(const std::vector<PermissionStatus>&)> callback()
const {
return callback_;
}
std::vector<PermissionType> permissions() const {
return permissions_;
}
std::vector<PermissionType> permissions() const { return permissions_; }
std::vector<PermissionStatus> results() const {
return results_;
}
std::vector<PermissionStatus> results() const { return results_; }
private:
int render_process_id_;
@@ -161,10 +155,7 @@ struct CefPermissionManager::Subscription {
};
CefPermissionManager::CefPermissionManager(CefBrowserContext* profile)
: profile_(profile),
context_(profile),
weak_ptr_factory_(this) {
}
: profile_(profile), context_(profile), weak_ptr_factory_(this) {}
CefPermissionManager::~CefPermissionManager() {
if (!subscriptions_.IsEmpty())
@@ -178,10 +169,8 @@ int CefPermissionManager::RequestPermission(
bool user_gesture,
const base::Callback<void(PermissionStatus)>& callback) {
return RequestPermissions(
std::vector<PermissionType>(1, permission),
render_frame_host,
requesting_origin,
user_gesture,
std::vector<PermissionType>(1, permission), render_frame_host,
requesting_origin, user_gesture,
base::Bind(&PermissionRequestResponseCallbackWrapper, callback));
}
@@ -190,8 +179,8 @@ int CefPermissionManager::RequestPermissions(
content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
bool user_gesture,
const base::Callback<void(
const std::vector<PermissionStatus>&)>& callback) {
const base::Callback<void(const std::vector<PermissionStatus>&)>&
callback) {
if (permissions.empty()) {
callback.Run(std::vector<PermissionStatus>());
return kNoPendingOperation;
@@ -202,8 +191,8 @@ int CefPermissionManager::RequestPermissions(
GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin();
std::unique_ptr<PendingRequest> pending_request =
base::MakeUnique<PendingRequest>(
render_frame_host, permissions, callback);
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);
@@ -213,14 +202,16 @@ int CefPermissionManager::RequestPermissions(
if (IsConstantPermission(permission) ||
!context_.SupportsPermission(permission)) {
OnPermissionsRequestResponseStatus(request_id, i,
OnPermissionsRequestResponseStatus(
request_id, i,
GetPermissionStatus(permission, requesting_origin, embedding_origin));
continue;
}
context_.RequestPermission(
permission, web_contents, request, requesting_origin,
base::Bind(&ContentSettingToPermissionStatusCallbackWrapper,
base::Bind(
&ContentSettingToPermissionStatusCallbackWrapper,
base::Bind(
&CefPermissionManager::OnPermissionsRequestResponseStatus,
weak_ptr_factory_.GetWeakPtr(), request_id, i)));
@@ -289,9 +280,8 @@ PermissionStatus CefPermissionManager::GetPermissionStatus(
if (!context_.SupportsPermission(permission))
return PermissionStatus::DENIED;
return ContentSettingToPermissionStatus(
context_.GetPermissionStatus(permission, requesting_origin,
embedding_origin));
return ContentSettingToPermissionStatus(context_.GetPermissionStatus(
permission, requesting_origin, embedding_origin));
}
int CefPermissionManager::SubscribePermissionStatusChange(
@@ -309,8 +299,7 @@ int CefPermissionManager::SubscribePermissionStatusChange(
subscription->callback = callback;
subscription->current_value = PermissionStatusToContentSetting(
GetPermissionStatus(permission,
subscription->requesting_origin,
GetPermissionStatus(permission, subscription->requesting_origin,
subscription->embedding_origin));
return subscriptions_.Add(std::move(subscription));
@@ -332,8 +321,8 @@ void CefPermissionManager::OnContentSettingChanged(
std::string resource_identifier) {
std::list<base::Closure> callbacks;
for (SubscriptionsMap::iterator iter(&subscriptions_);
!iter.IsAtEnd(); iter.Advance()) {
for (SubscriptionsMap::iterator iter(&subscriptions_); !iter.IsAtEnd();
iter.Advance()) {
Subscription* subscription = iter.GetCurrentValue();
if (permission_util::PermissionTypeToContentSetting(
subscription->permission) != content_type) {
@@ -347,10 +336,10 @@ void CefPermissionManager::OnContentSettingChanged(
!secondary_pattern.Matches(subscription->embedding_origin))
continue;
ContentSetting new_value = PermissionStatusToContentSetting(
GetPermissionStatus(subscription->permission,
subscription->requesting_origin,
subscription->embedding_origin));
ContentSetting new_value =
PermissionStatusToContentSetting(GetPermissionStatus(
subscription->permission, subscription->requesting_origin,
subscription->embedding_origin));
if (subscription->current_value == new_value)
continue;
@@ -358,9 +347,8 @@ void CefPermissionManager::OnContentSettingChanged(
// Add the callback to |callbacks| which will be run after the loop to
// prevent re-entrance issues.
callbacks.push_back(
base::Bind(subscription->callback,
ContentSettingToPermissionStatus(new_value)));
callbacks.push_back(base::Bind(
subscription->callback, ContentSettingToPermissionStatus(new_value)));
}
for (const auto& callback : callbacks)

6
libcef/browser/permissions/permission_manager.h
View File

@@ -44,8 +44,8 @@ class CefPermissionManager : public KeyedService,
content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
bool user_gesture,
const base::Callback<void(
const std::vector<blink::mojom::PermissionStatus>&)>& callback)
const base::Callback<
void(const std::vector<blink::mojom::PermissionStatus>&)>& callback)
override;
void CancelPermissionRequest(int request_id) override;
void ResetPermission(content::PermissionType permission,
@@ -97,4 +97,4 @@ class CefPermissionManager : public KeyedService,
DISALLOW_COPY_AND_ASSIGN(CefPermissionManager);
};
#endif // CEF_LIBCEF_BROWSER_PERMISSIONS_PERMISSION_MANAGER_H_
#endif // CEF_LIBCEF_BROWSER_PERMISSIONS_PERMISSION_MANAGER_H_

2
libcef/browser/permissions/permission_util.h
View File

@@ -16,4 +16,4 @@ ContentSettingsType PermissionTypeToContentSetting(
} // namespace permission_util
#endif // CEF_LIBCEF_BROWSER_PERMISSIONS_PERMISSION_UTIL_H_
#endif // CEF_LIBCEF_BROWSER_PERMISSIONS_PERMISSION_UTIL_H_