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

Unified Diff: ash/host/transformer_helper.h

Issue 1867223004: Convert //ash 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
Index: ash/host/transformer_helper.h
diff --git a/ash/host/transformer_helper.h b/ash/host/transformer_helper.h
index fdf315c9ed507a97bce8357b4711b91263374779..cd8f9981e951668d396b09786511198a9c953bb0 100644
--- a/ash/host/transformer_helper.h
+++ b/ash/host/transformer_helper.h
@@ -5,8 +5,9 @@
#ifndef ASH_HOST_TRANSFORMER_HELPER_H_
#define ASH_HOST_TRANSFORMER_HELPER_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
namespace gfx {
class Insets;
@@ -36,7 +37,8 @@ class TransformerHelper {
void SetTransform(const gfx::Transform& transform);
// Sets a RootWindowTransformer which takes the insets into account.
- void SetRootWindowTransformer(scoped_ptr<RootWindowTransformer> transformer);
+ void SetRootWindowTransformer(
+ std::unique_ptr<RootWindowTransformer> transformer);
// Returns the transforms applied to the root window.
gfx::Transform GetTransform() const;
@@ -48,7 +50,7 @@ class TransformerHelper {
private:
AshWindowTreeHost* ash_host_;
- scoped_ptr<RootWindowTransformer> transformer_;
+ std::unique_ptr<RootWindowTransformer> transformer_;
DISALLOW_COPY_AND_ASSIGN(TransformerHelper);
};

Powered by Google App Engine
This is Rietveld 408576698