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,8 +6,8 @@
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
#include "include/base/cef_bind.h"
|
||||
#include "include/base/cef_build.h"
|
||||
#include "include/base/cef_callback.h"
|
||||
#include "include/cef_app.h"
|
||||
#include "include/views/cef_box_layout.h"
|
||||
#include "include/wrapper/cef_helpers.h"
|
||||
@@ -313,7 +313,7 @@ void ViewsWindow::OnExtensionsChanged(const ExtensionSet& extensions) {
|
||||
image_set.push_back(
|
||||
ImageCache::ImageInfo::Create1x(icon_path, icon_path, internal));
|
||||
} else {
|
||||
// Get a NULL image and use the default icon.
|
||||
// Get a nullptr image and use the default icon.
|
||||
image_set.push_back(ImageCache::ImageInfo::Empty());
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user