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:
@@ -4,7 +4,8 @@
|
||||
|
||||
#include "tests/shared/browser/extension_util.h"
|
||||
|
||||
#include "include/base/cef_bind.h"
|
||||
#include "include/base/cef_callback.h"
|
||||
#include "include/base/cef_cxx17_backports.h"
|
||||
#include "include/cef_parser.h"
|
||||
#include "include/cef_path_util.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
@@ -120,7 +121,7 @@ bool IsInternalExtension(const std::string& extension_path) {
|
||||
static const char* extensions[] = {"set_page_color"};
|
||||
|
||||
const std::string& internal_path = GetInternalPath(extension_path);
|
||||
for (size_t i = 0; i < arraysize(extensions); ++i) {
|
||||
for (size_t i = 0; i < base::size(extensions); ++i) {
|
||||
// Exact match or first directory component.
|
||||
const std::string& extension = extensions[i];
|
||||
if (internal_path == extension ||
|
||||
|
Reference in New Issue
Block a user