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

Side by Side Diff: ash/wm/window_cycle_list.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/window_cycle_controller_unittest.cc ('k') | ash/wm/window_manager_unittest.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_WINDOW_CYCLE_LIST_H_ 5 #ifndef ASH_WM_WINDOW_CYCLE_LIST_H_
6 #define ASH_WM_WINDOW_CYCLE_LIST_H_ 6 #define ASH_WM_WINDOW_CYCLE_LIST_H_
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 "ash/wm/window_cycle_controller.h" 12 #include "ash/wm/window_cycle_controller.h"
12 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
13 #include "base/macros.h" 14 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h"
15 #include "ui/aura/window_observer.h" 15 #include "ui/aura/window_observer.h"
16 16
17 namespace ash { 17 namespace ash {
18 18
19 class ScopedShowWindow; 19 class ScopedShowWindow;
20 20
21 // Tracks a set of Windows that can be stepped through. This class is used by 21 // Tracks a set of Windows that can be stepped through. This class is used by
22 // the WindowCycleController. 22 // the WindowCycleController.
23 class ASH_EXPORT WindowCycleList : public aura::WindowObserver { 23 class ASH_EXPORT WindowCycleList : public aura::WindowObserver {
24 public: 24 public:
(...skipping 20 matching lines...) Expand all
45 // List of weak pointers to windows to use while cycling with the keyboard. 45 // List of weak pointers to windows to use while cycling with the keyboard.
46 // List is built when the user initiates the gesture (i.e. hits alt-tab the 46 // List is built when the user initiates the gesture (i.e. hits alt-tab the
47 // first time) and is emptied when the gesture is complete (i.e. releases the 47 // first time) and is emptied when the gesture is complete (i.e. releases the
48 // alt key). 48 // alt key).
49 WindowList windows_; 49 WindowList windows_;
50 50
51 // Current position in the |windows_| 51 // Current position in the |windows_|
52 int current_index_; 52 int current_index_;
53 53
54 // Wrapper for the window brought to the front. 54 // Wrapper for the window brought to the front.
55 scoped_ptr<ScopedShowWindow> showing_window_; 55 std::unique_ptr<ScopedShowWindow> showing_window_;
56 56
57 DISALLOW_COPY_AND_ASSIGN(WindowCycleList); 57 DISALLOW_COPY_AND_ASSIGN(WindowCycleList);
58 }; 58 };
59 59
60 } // namespace ash 60 } // namespace ash
61 61
62 #endif // ASH_WM_WINDOW_CYCLE_LIST_H_ 62 #endif // ASH_WM_WINDOW_CYCLE_LIST_H_
OLDNEW
« no previous file with comments | « ash/wm/window_cycle_controller_unittest.cc ('k') | ash/wm/window_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698