mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Various fixes related to the C++11/14 update (see issue #3140)
- Convert scoped_ptr to std::unique_ptr from <memory> - Convert arraysize to base::size from include/base/cef_cxx17_backports.h - Convert NULL to nullptr - Include include/base/cef_callback.h instead of include/base/cef_bind.h - Implicit conversion of CefRefPtr<T> or scoped_refptr<T> to T* is gone; use .get() instead See the issue for additional details.
This commit is contained in:
@@ -6,7 +6,8 @@
|
||||
#define CEF_TESTS_CEFCLIENT_BROWSER_MAIN_CONTEXT_IMPL_H_
|
||||
#pragma once
|
||||
|
||||
#include "include/base/cef_scoped_ptr.h"
|
||||
#include <memory>
|
||||
|
||||
#include "include/base/cef_thread_checker.h"
|
||||
#include "include/cef_app.h"
|
||||
#include "include/cef_command_line.h"
|
||||
@@ -48,8 +49,8 @@ class MainContextImpl : public MainContext {
|
||||
void Shutdown();
|
||||
|
||||
private:
|
||||
// Allow deletion via scoped_ptr only.
|
||||
friend struct base::DefaultDeleter<MainContextImpl>;
|
||||
// Allow deletion via std::unique_ptr only.
|
||||
friend std::default_delete<MainContextImpl>;
|
||||
|
||||
~MainContextImpl();
|
||||
|
||||
@@ -75,7 +76,7 @@ class MainContextImpl : public MainContext {
|
||||
bool use_views_;
|
||||
bool touch_events_enabled_;
|
||||
|
||||
scoped_ptr<RootWindowManager> root_window_manager_;
|
||||
std::unique_ptr<RootWindowManager> root_window_manager_;
|
||||
|
||||
#if defined(OS_WIN)
|
||||
bool shared_texture_enabled_;
|
||||
|
Reference in New Issue
Block a user