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

Side by Side Diff: ash/display/shared_display_edge_indicator.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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_SHARED_DISPLAY_EDGE_INDICATOR_H_ 5 #ifndef ASH_DISPLAY_SHARED_DISPLAY_EDGE_INDICATOR_H_
6 #define ASH_DISPLAY_SHARED_DISPLAY_EDGE_INDICATOR_H_ 6 #define ASH_DISPLAY_SHARED_DISPLAY_EDGE_INDICATOR_H_
7 7
8 #include <memory>
9
8 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "ui/gfx/animation/animation_delegate.h" 12 #include "ui/gfx/animation/animation_delegate.h"
12 #include "ui/gfx/display.h" 13 #include "ui/gfx/display.h"
13 14
14 namespace gfx { 15 namespace gfx {
15 class Rect; 16 class Rect;
16 class ThrobAnimation; 17 class ThrobAnimation;
17 } 18 }
18 19
19 namespace views { 20 namespace views {
20 class View; 21 class View;
(...skipping 19 matching lines...) Expand all
40 void AnimationProgressed(const gfx::Animation* animation) override; 41 void AnimationProgressed(const gfx::Animation* animation) override;
41 42
42 private: 43 private:
43 // Used to show the displays' shared edge where a window can be moved across. 44 // Used to show the displays' shared edge where a window can be moved across.
44 // |src_widget_| is for the display where drag starts and |dst_widget_| is 45 // |src_widget_| is for the display where drag starts and |dst_widget_| is
45 // for the other display. 46 // for the other display.
46 views::View* src_indicator_; 47 views::View* src_indicator_;
47 views::View* dst_indicator_; 48 views::View* dst_indicator_;
48 49
49 // Used to transition the opacity. 50 // Used to transition the opacity.
50 scoped_ptr<gfx::ThrobAnimation> animation_; 51 std::unique_ptr<gfx::ThrobAnimation> animation_;
51 52
52 DISALLOW_COPY_AND_ASSIGN(SharedDisplayEdgeIndicator); 53 DISALLOW_COPY_AND_ASSIGN(SharedDisplayEdgeIndicator);
53 }; 54 };
54 55
55 } // namespace ash 56 } // namespace ash
56 57
57 #endif // ASH_DISPLAY_SHARED_DISPLAY_EDGE_INDICATOR_H_ 58 #endif // ASH_DISPLAY_SHARED_DISPLAY_EDGE_INDICATOR_H_
OLDNEW
« no previous file with comments | « ash/display/screen_position_controller_unittest.cc ('k') | ash/display/window_tree_host_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698