Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(406)

Unified Diff: ui/ozone/platform/caca/ozone_platform_caca.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/ozone/platform/caca/caca_window_manager.cc ('k') | ui/ozone/platform/caca/scoped_caca_types.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/caca/ozone_platform_caca.cc
diff --git a/ui/ozone/platform/caca/ozone_platform_caca.cc b/ui/ozone/platform/caca/ozone_platform_caca.cc
index dff1fdd2fb4d2318a63356f677adf329163681b9..43cccb645b0d00a0b9e9a8f06330d1d6c49d03b5 100644
--- a/ui/ozone/platform/caca/ozone_platform_caca.cc
+++ b/ui/ozone/platform/caca/ozone_platform_caca.cc
@@ -5,6 +5,7 @@
#include "ui/ozone/platform/caca/ozone_platform_caca.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
#include "ui/events/ozone/layout/no/no_keyboard_layout_engine.h"
#include "ui/ozone/common/native_display_delegate_ozone.h"
@@ -47,20 +48,21 @@ class OzonePlatformCaca : public OzonePlatform {
GpuPlatformSupportHost* GetGpuPlatformSupportHost() override {
return gpu_platform_support_host_.get();
}
- scoped_ptr<SystemInputInjector> CreateSystemInputInjector() override {
+ std::unique_ptr<SystemInputInjector> CreateSystemInputInjector() override {
return nullptr; // no input injection support.
}
- scoped_ptr<PlatformWindow> CreatePlatformWindow(
+ std::unique_ptr<PlatformWindow> CreatePlatformWindow(
PlatformWindowDelegate* delegate,
const gfx::Rect& bounds) override {
- scoped_ptr<CacaWindow> caca_window(new CacaWindow(
+ std::unique_ptr<CacaWindow> caca_window(new CacaWindow(
delegate, window_manager_.get(), event_source_.get(), bounds));
if (!caca_window->Initialize())
return nullptr;
return std::move(caca_window);
}
- scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override {
- return make_scoped_ptr(new NativeDisplayDelegateOzone());
+ std::unique_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate()
+ override {
+ return base::WrapUnique(new NativeDisplayDelegateOzone());
}
void InitializeUI() override {
@@ -71,7 +73,7 @@ class OzonePlatformCaca : public OzonePlatform {
gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost());
input_controller_ = CreateStubInputController();
KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(
- make_scoped_ptr(new NoKeyboardLayoutEngine()));
+ base::WrapUnique(new NoKeyboardLayoutEngine()));
}
void InitializeGPU() override {
@@ -79,13 +81,13 @@ class OzonePlatformCaca : public OzonePlatform {
}
private:
- scoped_ptr<CacaWindowManager> window_manager_;
- scoped_ptr<CacaEventSource> event_source_;
- scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_;
- scoped_ptr<GpuPlatformSupport> gpu_platform_support_;
- scoped_ptr<GpuPlatformSupportHost> gpu_platform_support_host_;
- scoped_ptr<InputController> input_controller_;
- scoped_ptr<OverlayManagerOzone> overlay_manager_;
+ std::unique_ptr<CacaWindowManager> window_manager_;
+ std::unique_ptr<CacaEventSource> event_source_;
+ std::unique_ptr<CursorFactoryOzone> cursor_factory_ozone_;
+ std::unique_ptr<GpuPlatformSupport> gpu_platform_support_;
+ std::unique_ptr<GpuPlatformSupportHost> gpu_platform_support_host_;
+ std::unique_ptr<InputController> input_controller_;
+ std::unique_ptr<OverlayManagerOzone> overlay_manager_;
DISALLOW_COPY_AND_ASSIGN(OzonePlatformCaca);
};
« no previous file with comments | « ui/ozone/platform/caca/caca_window_manager.cc ('k') | ui/ozone/platform/caca/scoped_caca_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698