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

Unified Diff: ash/first_run/desktop_cleaner.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/extended_desktop_unittest.cc ('k') | ash/first_run/first_run_helper_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/first_run/desktop_cleaner.h
diff --git a/ash/first_run/desktop_cleaner.h b/ash/first_run/desktop_cleaner.h
index 63d0f3856ff1b387e3b02842c8f80e4d1e80fdee..fe762825de2aaa9aa34b1430ea4d1a6189a7f7b6 100644
--- a/ash/first_run/desktop_cleaner.h
+++ b/ash/first_run/desktop_cleaner.h
@@ -5,12 +5,12 @@
#ifndef ASH_FIRST_RUN_DESKTOP_CLEANER_
#define ASH_FIRST_RUN_DESKTOP_CLEANER_
+#include <memory>
#include <vector>
#include "ash/ash_export.h"
#include "base/macros.h"
#include "base/memory/linked_ptr.h"
-#include "base/memory/scoped_ptr.h"
namespace ash {
class ContainerHider;
@@ -31,7 +31,7 @@ class ASH_EXPORT DesktopCleaner {
static std::vector<int> GetContainersToHideForTest();
std::vector<linked_ptr<ContainerHider> > container_hiders_;
- scoped_ptr<NotificationBlocker> notification_blocker_;
+ std::unique_ptr<NotificationBlocker> notification_blocker_;
friend class ash::test::FirstRunHelperTest;
DISALLOW_COPY_AND_ASSIGN(DesktopCleaner);
« no previous file with comments | « ash/extended_desktop_unittest.cc ('k') | ash/first_run/first_run_helper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698