Index: ash/wm/system_background_controller.h |
diff --git a/ash/wm/system_background_controller.h b/ash/wm/system_background_controller.h |
index 45303025730949162f3f942c2355e0153ff876f0..a23863f3dda361375e1cad9c95fbb9178fba1aad 100644 |
--- a/ash/wm/system_background_controller.h |
+++ b/ash/wm/system_background_controller.h |
@@ -5,11 +5,11 @@ |
#ifndef ASH_WM_SYSTEM_BACKGROUND_CONTROLLER_H_ |
#define ASH_WM_SYSTEM_BACKGROUND_CONTROLLER_H_ |
+#include <memory> |
#include <string> |
#include "ash/ash_export.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "third_party/skia/include/core/SkColor.h" |
#include "ui/aura/window_observer.h" |
@@ -42,7 +42,7 @@ class SystemBackgroundController : public aura::WindowObserver { |
aura::Window* root_window_; // not owned |
- scoped_ptr<ui::Layer> layer_; |
+ std::unique_ptr<ui::Layer> layer_; |
DISALLOW_COPY_AND_ASSIGN(SystemBackgroundController); |
}; |