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

Side by Side Diff: ash/display/display_animator_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 unified diff | Download patch
« no previous file with comments | « ash/display/cursor_window_controller.h ('k') | ash/display/display_color_manager_chromeos.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 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_DISPLAY_DISPLAY_ANIMATOR_CHROMEOS_H_ 5 #ifndef ASH_DISPLAY_DISPLAY_ANIMATOR_CHROMEOS_H_
6 #define ASH_DISPLAY_DISPLAY_ANIMATOR_CHROMEOS_H_ 6 #define ASH_DISPLAY_DISPLAY_ANIMATOR_CHROMEOS_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory>
9 10
10 #include "ash/ash_export.h" 11 #include "ash/ash_export.h"
11 #include "ash/display/display_animator.h" 12 #include "ash/display/display_animator.h"
12 #include "base/callback.h" 13 #include "base/callback.h"
13 #include "base/macros.h" 14 #include "base/macros.h"
14 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
15 #include "base/timer/timer.h" 16 #include "base/timer/timer.h"
16 #include "ui/display/chromeos/display_configurator.h" 17 #include "ui/display/chromeos/display_configurator.h"
17 18
18 namespace aura { 19 namespace aura {
(...skipping 29 matching lines...) Expand all
48 const ui::DisplayConfigurator::DisplayStateList& displays, 49 const ui::DisplayConfigurator::DisplayStateList& displays,
49 ui::MultipleDisplayState failed_new_state) override; 50 ui::MultipleDisplayState failed_new_state) override;
50 51
51 private: 52 private:
52 // Clears all hiding layers. Note that in case that this method is called 53 // Clears all hiding layers. Note that in case that this method is called
53 // during an animation, the method call will cancel all of the animations 54 // during an animation, the method call will cancel all of the animations
54 // and *not* call the registered callback. 55 // and *not* call the registered callback.
55 void ClearHidingLayers(); 56 void ClearHidingLayers();
56 57
57 std::map<aura::Window*, ui::Layer*> hiding_layers_; 58 std::map<aura::Window*, ui::Layer*> hiding_layers_;
58 scoped_ptr<base::OneShotTimer> timer_; 59 std::unique_ptr<base::OneShotTimer> timer_;
59 base::WeakPtrFactory<DisplayAnimatorChromeOS> weak_ptr_factory_; 60 base::WeakPtrFactory<DisplayAnimatorChromeOS> weak_ptr_factory_;
60 61
61 DISALLOW_COPY_AND_ASSIGN(DisplayAnimatorChromeOS); 62 DISALLOW_COPY_AND_ASSIGN(DisplayAnimatorChromeOS);
62 }; 63 };
63 64
64 } // namespace ash 65 } // namespace ash
65 66
66 #endif // ASH_DISPLAY_DISPLAY_ANIMATOR_CHROMEOS_H_ 67 #endif // ASH_DISPLAY_DISPLAY_ANIMATOR_CHROMEOS_H_
OLDNEW
« no previous file with comments | « ash/display/cursor_window_controller.h ('k') | ash/display/display_color_manager_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698