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

Side by Side 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: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_FIRST_RUN_DESKTOP_CLEANER_ 5 #ifndef ASH_FIRST_RUN_DESKTOP_CLEANER_
6 #define ASH_FIRST_RUN_DESKTOP_CLEANER_ 6 #define ASH_FIRST_RUN_DESKTOP_CLEANER_
7 7
8 #include <memory>
8 #include <vector> 9 #include <vector>
9 10
10 #include "ash/ash_export.h" 11 #include "ash/ash_export.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/linked_ptr.h" 13 #include "base/memory/linked_ptr.h"
13 #include "base/memory/scoped_ptr.h"
14 14
15 namespace ash { 15 namespace ash {
16 class ContainerHider; 16 class ContainerHider;
17 class NotificationBlocker; 17 class NotificationBlocker;
18 18
19 namespace test { 19 namespace test {
20 class FirstRunHelperTest; 20 class FirstRunHelperTest;
21 } 21 }
22 22
23 // Class used to "clean" ash desktop, i.e. hide all windows and notifications. 23 // Class used to "clean" ash desktop, i.e. hide all windows and notifications.
24 class ASH_EXPORT DesktopCleaner { 24 class ASH_EXPORT DesktopCleaner {
25 public: 25 public:
26 DesktopCleaner(); 26 DesktopCleaner();
27 ~DesktopCleaner(); 27 ~DesktopCleaner();
28 28
29 private: 29 private:
30 // Returns the list of containers that DesctopCleaner hides. 30 // Returns the list of containers that DesctopCleaner hides.
31 static std::vector<int> GetContainersToHideForTest(); 31 static std::vector<int> GetContainersToHideForTest();
32 32
33 std::vector<linked_ptr<ContainerHider> > container_hiders_; 33 std::vector<linked_ptr<ContainerHider> > container_hiders_;
34 scoped_ptr<NotificationBlocker> notification_blocker_; 34 std::unique_ptr<NotificationBlocker> notification_blocker_;
35 35
36 friend class ash::test::FirstRunHelperTest; 36 friend class ash::test::FirstRunHelperTest;
37 DISALLOW_COPY_AND_ASSIGN(DesktopCleaner); 37 DISALLOW_COPY_AND_ASSIGN(DesktopCleaner);
38 }; 38 };
39 39
40 } // namespace ash 40 } // namespace ash
41 41
42 #endif // ASH_FIRST_RUN_DESKTOP_CLEANER_ 42 #endif // ASH_FIRST_RUN_DESKTOP_CLEANER_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698