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

Various fixes related to the C++11/14 update (see issue #3140)

Browse Source 
- 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:
Marshall Greenblatt
2021-06-17 16:08:01 -04:00
parent 5d438ced79
commit 17fc2b3e3b
141 changed files with 580 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/cefclient/browser/window_test.cc
View File

@@ -9,7 +9,7 @@
#include <string>
#include <vector>
#include "include/base/cef_bind.h"
#include "include/base/cef_callback.h"
#include "include/wrapper/cef_stream_resource_handler.h"
#include "tests/cefclient/browser/main_context.h"
#include "tests/cefclient/browser/test_runner.h"
@@ -39,18 +39,18 @@ const char kMessageMaximizeName[] = "WindowTest.Maximize";
const char kMessageRestoreName[] = "WindowTest.Restore";
// Create the appropriate platform test runner object.
scoped_ptr<WindowTestRunner> CreateWindowTestRunner() {
std::unique_ptr<WindowTestRunner> CreateWindowTestRunner() {
#if defined(OS_WIN) || defined(OS_LINUX)
if (MainContext::Get()->UseViews())
return scoped_ptr<WindowTestRunner>(new WindowTestRunnerViews());
return std::make_unique<WindowTestRunnerViews>();
#endif
#if defined(OS_WIN)
return scoped_ptr<WindowTestRunner>(new WindowTestRunnerWin());
return std::make_unique<WindowTestRunnerWin>();
#elif defined(OS_LINUX)
return scoped_ptr<WindowTestRunner>(new WindowTestRunnerGtk());
return std::make_unique<WindowTestRunnerGtk>();
#elif defined(OS_MAC)
return scoped_ptr<WindowTestRunner>(new WindowTestRunnerMac());
return std::make_unique<WindowTestRunnerMac>();
#else
#error "No implementation available for your platform."
#endif
@@ -109,7 +109,7 @@ class Handler : public CefMessageRouterBrowserSide::Handler {
}
private:
scoped_ptr<WindowTestRunner> runner_;
std::unique_ptr<WindowTestRunner> runner_;
};
} // namespace