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

Unified Diff: ash/wm/boot_splash_screen_chromeos.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: address comments 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 | « ash/wm/ash_native_cursor_manager.h ('k') | ash/wm/cursor_manager_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/boot_splash_screen_chromeos.h
diff --git a/ash/wm/boot_splash_screen_chromeos.h b/ash/wm/boot_splash_screen_chromeos.h
index d1704cb3617ef6584b740a26fbb32ed86a593dc0..db12b1b7f56d4e20d7a91142a6e6382a824baf38 100644
--- a/ash/wm/boot_splash_screen_chromeos.h
+++ b/ash/wm/boot_splash_screen_chromeos.h
@@ -5,10 +5,10 @@
#ifndef ASH_WM_BOOT_SPLASH_SCREEN_CHROMEOS_H_
#define ASH_WM_BOOT_SPLASH_SCREEN_CHROMEOS_H_
+#include <memory>
#include <string>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
namespace aura {
@@ -39,9 +39,9 @@ class BootSplashScreen {
class CopyHostContentLayerDelegate;
// Copies the host window's content to |layer_|.
- scoped_ptr<CopyHostContentLayerDelegate> layer_delegate_;
+ std::unique_ptr<CopyHostContentLayerDelegate> layer_delegate_;
- scoped_ptr<ui::Layer> layer_;
+ std::unique_ptr<ui::Layer> layer_;
DISALLOW_COPY_AND_ASSIGN(BootSplashScreen);
};
« no previous file with comments | « ash/wm/ash_native_cursor_manager.h ('k') | ash/wm/cursor_manager_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698