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,7 @@
|
||||
#define CEF_TESTS_CEFCLIENT_BROWSER_OSR_WINDOW_WIN_H_
|
||||
#pragma once
|
||||
|
||||
#include "include/base/cef_bind.h"
|
||||
#include "include/base/cef_callback.h"
|
||||
#include "include/base/cef_ref_counted.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "include/wrapper/cef_helpers.h"
|
||||
@@ -173,10 +173,10 @@ class OsrWindowWin
|
||||
|
||||
const OsrRendererSettings settings_;
|
||||
HWND hwnd_;
|
||||
scoped_ptr<OsrRenderHandlerWin> render_handler_;
|
||||
std::unique_ptr<OsrRenderHandlerWin> render_handler_;
|
||||
|
||||
// Class that encapsulates IMM32 APIs and controls IMEs attached to a window.
|
||||
scoped_ptr<OsrImeHandlerWin> ime_handler_;
|
||||
std::unique_ptr<OsrImeHandlerWin> ime_handler_;
|
||||
|
||||
RECT client_rect_;
|
||||
float device_scale_factor_;
|
||||
@@ -189,7 +189,7 @@ class OsrWindowWin
|
||||
|
||||
// Class that abstracts the accessibility information received from the
|
||||
// renderer.
|
||||
scoped_ptr<OsrAccessibilityHelper> accessibility_handler_;
|
||||
std::unique_ptr<OsrAccessibilityHelper> accessibility_handler_;
|
||||
IAccessible* accessibility_root_;
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user