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:
@ -70,6 +70,10 @@ class CefBrowserImpl : public CefBrowser, public blink::WebViewObserver {
|
||||
int browser_id,
|
||||
bool is_popup,
|
||||
bool is_windowless);
|
||||
|
||||
CefBrowserImpl(const CefBrowserImpl&) = delete;
|
||||
CefBrowserImpl& operator=(const CefBrowserImpl&) = delete;
|
||||
|
||||
~CefBrowserImpl() override;
|
||||
|
||||
// Returns the matching CefFrameImpl reference or creates a new one.
|
||||
@ -98,12 +102,12 @@ class CefBrowserImpl : public CefBrowser, public blink::WebViewObserver {
|
||||
bool is_windowless_;
|
||||
|
||||
// Map of unique frame ids to CefFrameImpl references.
|
||||
typedef std::map<int64, CefRefPtr<CefFrameImpl>> FrameMap;
|
||||
using FrameMap = std::map<int64, CefRefPtr<CefFrameImpl>>;
|
||||
FrameMap frames_;
|
||||
|
||||
// Map of unique frame ids to CefTrackManager objects that need to be cleaned
|
||||
// up when the frame is deleted.
|
||||
typedef std::map<int64, CefRefPtr<CefTrackManager>> FrameObjectMap;
|
||||
using FrameObjectMap = std::map<int64, CefRefPtr<CefTrackManager>>;
|
||||
FrameObjectMap frame_objects_;
|
||||
|
||||
struct LoadingState {
|
||||
@ -124,7 +128,6 @@ class CefBrowserImpl : public CefBrowser, public blink::WebViewObserver {
|
||||
std::unique_ptr<LoadingState> last_loading_state_;
|
||||
|
||||
IMPLEMENT_REFCOUNTING(CefBrowserImpl);
|
||||
DISALLOW_COPY_AND_ASSIGN(CefBrowserImpl);
|
||||
};
|
||||
|
||||
#endif // CEF_LIBCEF_RENDERER_BROWSER_IMPL_H_
|
||||
|
Reference in New Issue
Block a user