mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Remove DISALLOW_ macro from libcef/ (see issue #3234)
Also perform related C++ cleanup: - Use =default instead of {} for default implementations of constructors/destructors. - Replace typedef with using.
This commit is contained in:
@@ -53,6 +53,9 @@ class RedirectHandler : public CefResourceHandler {
|
||||
public:
|
||||
explicit RedirectHandler(const GURL& url) : url_(url) {}
|
||||
|
||||
RedirectHandler(const RedirectHandler&) = delete;
|
||||
RedirectHandler& operator=(const RedirectHandler&) = delete;
|
||||
|
||||
bool Open(CefRefPtr<CefRequest> request,
|
||||
bool& handle_request,
|
||||
CefRefPtr<CefCallback> callback) override {
|
||||
@@ -82,7 +85,6 @@ class RedirectHandler : public CefResourceHandler {
|
||||
GURL url_;
|
||||
|
||||
IMPLEMENT_REFCOUNTING(RedirectHandler);
|
||||
DISALLOW_COPY_AND_ASSIGN(RedirectHandler);
|
||||
};
|
||||
|
||||
class InternalHandler : public CefResourceHandler {
|
||||
@@ -92,6 +94,9 @@ class InternalHandler : public CefResourceHandler {
|
||||
int size)
|
||||
: mime_type_(mime_type), reader_(reader), size_(size) {}
|
||||
|
||||
InternalHandler(const InternalHandler&) = delete;
|
||||
InternalHandler& operator=(const InternalHandler&) = delete;
|
||||
|
||||
bool Open(CefRefPtr<CefRequest> request,
|
||||
bool& handle_request,
|
||||
CefRefPtr<CefCallback> callback) override {
|
||||
@@ -135,7 +140,6 @@ class InternalHandler : public CefResourceHandler {
|
||||
int size_;
|
||||
|
||||
IMPLEMENT_REFCOUNTING(InternalHandler);
|
||||
DISALLOW_COPY_AND_ASSIGN(InternalHandler);
|
||||
};
|
||||
|
||||
class InternalHandlerFactory : public CefSchemeHandlerFactory {
|
||||
@@ -144,6 +148,9 @@ class InternalHandlerFactory : public CefSchemeHandlerFactory {
|
||||
std::unique_ptr<InternalHandlerDelegate> delegate)
|
||||
: delegate_(std::move(delegate)) {}
|
||||
|
||||
InternalHandlerFactory(const InternalHandlerFactory&) = delete;
|
||||
InternalHandlerFactory& operator=(const InternalHandlerFactory&) = delete;
|
||||
|
||||
CefRefPtr<CefResourceHandler> Create(CefRefPtr<CefBrowser> browser,
|
||||
CefRefPtr<CefFrame> frame,
|
||||
const CefString& scheme_name,
|
||||
@@ -190,7 +197,6 @@ class InternalHandlerFactory : public CefSchemeHandlerFactory {
|
||||
std::unique_ptr<InternalHandlerDelegate> delegate_;
|
||||
|
||||
IMPLEMENT_REFCOUNTING(InternalHandlerFactory);
|
||||
DISALLOW_COPY_AND_ASSIGN(InternalHandlerFactory);
|
||||
};
|
||||
|
||||
} // namespace
|
||||
|
Reference in New Issue
Block a user