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

Unified Diff: components/mus/ws/platform_display.h

Issue 1906623003: Convert //components/mus from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « components/mus/ws/focus_controller_unittest.cc ('k') | components/mus/ws/platform_display.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/ws/platform_display.h
diff --git a/components/mus/ws/platform_display.h b/components/mus/ws/platform_display.h
index e293dbc38e4409b4fd4d69b03ba87ef4552d750c..8aba25bf6cf592361e0a96c94ef26f00bd14a801 100644
--- a/components/mus/ws/platform_display.h
+++ b/components/mus/ws/platform_display.h
@@ -8,9 +8,9 @@
#include <stdint.h>
#include <map>
+#include <memory>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/string16.h"
#include "base/timer/timer.h"
@@ -91,7 +91,7 @@ class PlatformDisplay {
virtual bool IsFramePending() const = 0;
virtual void RequestCopyOfOutput(
- scoped_ptr<cc::CopyOutputRequest> output_request) = 0;
+ std::unique_ptr<cc::CopyOutputRequest> output_request) = 0;
// Overrides factory for testing. Default (NULL) value indicates regular
// (non-test) environment.
@@ -127,7 +127,7 @@ class DefaultPlatformDisplay : public PlatformDisplay,
void SetImeVisibility(bool visible) override;
bool IsFramePending() const override;
void RequestCopyOfOutput(
- scoped_ptr<cc::CopyOutputRequest> output_request) override;
+ std::unique_ptr<cc::CopyOutputRequest> output_request) override;
private:
void WantToDraw();
@@ -142,7 +142,7 @@ class DefaultPlatformDisplay : public PlatformDisplay,
// if there is budget for it.
void DidDraw();
void UpdateMetrics(const gfx::Size& size, float device_pixel_ratio);
- scoped_ptr<cc::CompositorFrame> GenerateCompositorFrame();
+ std::unique_ptr<cc::CompositorFrame> GenerateCompositorFrame();
// ui::PlatformWindowDelegate:
void OnBoundsChanged(const gfx::Rect& new_bounds) override;
@@ -167,11 +167,11 @@ class DefaultPlatformDisplay : public PlatformDisplay,
base::Timer draw_timer_;
bool frame_pending_;
- scoped_ptr<TopLevelDisplayClient> top_level_display_client_;
- scoped_ptr<ui::PlatformWindow> platform_window_;
+ std::unique_ptr<TopLevelDisplayClient> top_level_display_client_;
+ std::unique_ptr<ui::PlatformWindow> platform_window_;
#if !defined(OS_ANDROID)
- scoped_ptr<ui::CursorLoader> cursor_loader_;
+ std::unique_ptr<ui::CursorLoader> cursor_loader_;
#endif
base::WeakPtrFactory<DefaultPlatformDisplay> weak_factory_;
« no previous file with comments | « components/mus/ws/focus_controller_unittest.cc ('k') | components/mus/ws/platform_display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698