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_dll/ (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 16:59:14 -05:00
parent 9484d6528c
commit 1eb55cbba8
22 changed files with 112 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libcef_dll/wrapper/cef_resource_manager.cc
View File

@@ -8,7 +8,6 @@
#include <vector>
#include "include/base/cef_callback.h"
#include "include/base/cef_macros.h"
#include "include/base/cef_weak_ptr.h"
#include "include/cef_parser.h"
#include "include/wrapper/cef_stream_resource_handler.h"
@@ -61,6 +60,9 @@ class ContentProvider : public CefResourceManager::Provider {
DCHECK(!content.empty());
}
ContentProvider(const ContentProvider&) = delete;
ContentProvider& operator=(const ContentProvider&) = delete;
bool OnRequest(scoped_refptr<CefResourceManager::Request> request) override {
CEF_REQUIRE_IO_THREAD();
@@ -86,8 +88,6 @@ class ContentProvider : public CefResourceManager::Provider {
std::string url_;
std::string content_;
std::string mime_type_;
DISALLOW_COPY_AND_ASSIGN(ContentProvider);
};
// Provider of contents loaded from a directory on the file system.
@@ -106,6 +106,9 @@ class DirectoryProvider : public CefResourceManager::Provider {
directory_path_ += PATH_SEP;
}
DirectoryProvider(const DirectoryProvider&) = delete;
DirectoryProvider& operator=(const DirectoryProvider&) = delete;
bool OnRequest(scoped_refptr<CefResourceManager::Request> request) override {
CEF_REQUIRE_IO_THREAD();
@@ -162,8 +165,6 @@ class DirectoryProvider : public CefResourceManager::Provider {
std::string url_path_;
std::string directory_path_;
DISALLOW_COPY_AND_ASSIGN(DirectoryProvider);
};
// Provider of contents loaded from an archive file.
@@ -186,6 +187,9 @@ class ArchiveProvider : public CefResourceManager::Provider {
url_path_ += '/';
}
ArchiveProvider(const ArchiveProvider&) = delete;
ArchiveProvider& operator=(const ArchiveProvider&) = delete;
bool OnRequest(scoped_refptr<CefResourceManager::Request> request) override {
CEF_REQUIRE_IO_THREAD();
@@ -287,14 +291,12 @@ class ArchiveProvider : public CefResourceManager::Provider {
CefRefPtr<CefZipArchive> archive_;
// List of requests that are pending while the archive is being loaded.
typedef std::vector<scoped_refptr<CefResourceManager::Request>>
PendingRequests;
using PendingRequests =
std::vector<scoped_refptr<CefResourceManager::Request>>;
PendingRequests pending_requests_;
// Must be the last member.
base::WeakPtrFactory<ArchiveProvider> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(ArchiveProvider);
};
} // namespace