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

Remove DISALLOW_ macro from libcef/ (see issue #3234)

Browse Source 
Also perform related C++ cleanup:
- Use =default instead of {} for default implementations of
  constructors/destructors.
- Replace typedef with using.
This commit is contained in:
Marshall Greenblatt
2021-12-06 15:40:25 -05:00
parent 83ffc1f00d
commit 9484d6528c
205 changed files with 944 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libcef/browser/net_service/resource_request_handler_wrapper.cc
View File

@@ -48,6 +48,9 @@ class RequestCallbackWrapper : public CefCallback {
: callback_(std::move(callback)),
work_thread_task_runner_(base::SequencedTaskRunnerHandle::Get()) {}
RequestCallbackWrapper(const RequestCallbackWrapper&) = delete;
RequestCallbackWrapper& operator=(const RequestCallbackWrapper&) = delete;
~RequestCallbackWrapper() override {
if (!callback_.is_null()) {
// Make sure it executes on the correct thread.
@@ -78,7 +81,6 @@ class RequestCallbackWrapper : public CefCallback {
scoped_refptr<base::SequencedTaskRunner> work_thread_task_runner_;
IMPLEMENT_REFCOUNTING(RequestCallbackWrapper);
DISALLOW_COPY_AND_ASSIGN(RequestCallbackWrapper);
};
class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler {
@@ -155,6 +157,9 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler {
}
}
DestructionObserver(const DestructionObserver&) = delete;
DestructionObserver& operator=(const DestructionObserver&) = delete;
virtual ~DestructionObserver() {
CEF_REQUIRE_UIT();
if (!registered_)
@@ -208,7 +213,6 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler {
bool registered_ = true;
base::WeakPtr<InterceptedRequestHandlerWrapper> wrapper_;
DISALLOW_COPY_AND_ASSIGN(DestructionObserver);
};
// Holds state information for InterceptedRequestHandlerWrapper. State is
@@ -315,6 +319,9 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler {
explicit InitHelper(InterceptedRequestHandlerWrapper* wrapper)
: wrapper_(wrapper) {}
InitHelper(const InitHelper&) = delete;
InitHelper& operator=(const InitHelper&) = delete;
void MaybeSetInitialized(std::unique_ptr<InitState> init_state) {
CEF_POST_TASK(CEF_IOT, base::BindOnce(&InitHelper::SetInitialized, this,
std::move(init_state)));
@@ -344,6 +351,11 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler {
: init_helper_(base::MakeRefCounted<InitHelper>(this)),
weak_ptr_factory_(this) {}
InterceptedRequestHandlerWrapper(const InterceptedRequestHandlerWrapper&) =
delete;
InterceptedRequestHandlerWrapper& operator=(
const InterceptedRequestHandlerWrapper&) = delete;
~InterceptedRequestHandlerWrapper() override {
CEF_REQUIRE_IOT();
@@ -1174,8 +1186,6 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler {
PendingRequests pending_requests_;
base::WeakPtrFactory<InterceptedRequestHandlerWrapper> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(InterceptedRequestHandlerWrapper);
};
} // namespace