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

Side by Side Diff: ash/wm/overview/window_selector_controller.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 unified diff | Download patch
« no previous file with comments | « ash/wm/overview/window_selector.cc ('k') | ash/wm/overview/window_selector_item.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_WM_OVERVIEW_WINDOW_SELECTOR_CONTROLLER_H_ 5 #ifndef ASH_WM_OVERVIEW_WINDOW_SELECTOR_CONTROLLER_H_
6 #define ASH_WM_OVERVIEW_WINDOW_SELECTOR_CONTROLLER_H_ 6 #define ASH_WM_OVERVIEW_WINDOW_SELECTOR_CONTROLLER_H_
7 7
8 #include <list> 8 #include <list>
9 #include <memory>
9 #include <vector> 10 #include <vector>
10 11
11 #include "ash/ash_export.h" 12 #include "ash/ash_export.h"
12 #include "ash/wm/overview/window_selector.h" 13 #include "ash/wm/overview/window_selector.h"
13 #include "ash/wm/overview/window_selector_delegate.h" 14 #include "ash/wm/overview/window_selector_delegate.h"
14 #include "base/macros.h" 15 #include "base/macros.h"
15 #include "base/memory/scoped_ptr.h"
16 #include "base/time/time.h" 16 #include "base/time/time.h"
17 #include "ui/aura/window_observer.h" 17 #include "ui/aura/window_observer.h"
18 18
19 namespace aura { 19 namespace aura {
20 class Window; 20 class Window;
21 } 21 }
22 22
23 namespace ash { 23 namespace ash {
24 class WindowSelector; 24 class WindowSelector;
25 class WindowSelectorTest; 25 class WindowSelectorTest;
(...skipping 24 matching lines...) Expand all
50 50
51 // WindowSelectorDelegate: 51 // WindowSelectorDelegate:
52 void OnSelectionEnded() override; 52 void OnSelectionEnded() override;
53 53
54 private: 54 private:
55 friend class WindowSelectorTest; 55 friend class WindowSelectorTest;
56 56
57 // Dispatched when window selection begins. 57 // Dispatched when window selection begins.
58 void OnSelectionStarted(); 58 void OnSelectionStarted();
59 59
60 scoped_ptr<WindowSelector> window_selector_; 60 std::unique_ptr<WindowSelector> window_selector_;
61 base::Time last_selection_time_; 61 base::Time last_selection_time_;
62 62
63 DISALLOW_COPY_AND_ASSIGN(WindowSelectorController); 63 DISALLOW_COPY_AND_ASSIGN(WindowSelectorController);
64 }; 64 };
65 65
66 } // namespace ash 66 } // namespace ash
67 67
68 #endif // ASH_WM_OVERVIEW_WINDOW_SELECTOR_CONTROLLER_H_ 68 #endif // ASH_WM_OVERVIEW_WINDOW_SELECTOR_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/wm/overview/window_selector.cc ('k') | ash/wm/overview/window_selector_item.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698