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

Side by Side Diff: ash/system/toast/toast_overlay.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_SYSTEM_TOAST_TOAST_OVERLAY_H_ 5 #ifndef ASH_SYSTEM_TOAST_TOAST_OVERLAY_H_
6 #define ASH_SYSTEM_TOAST_TOAST_OVERLAY_H_ 6 #define ASH_SYSTEM_TOAST_TOAST_OVERLAY_H_
7 7
8 #include <memory>
9
8 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "ui/compositor/layer_animation_observer.h" 11 #include "ui/compositor/layer_animation_observer.h"
11 #include "ui/events/event.h" 12 #include "ui/events/event.h"
12 #include "ui/events/event_constants.h" 13 #include "ui/events/event_constants.h"
13 #include "ui/gfx/geometry/size.h" 14 #include "ui/gfx/geometry/size.h"
14 #include "ui/views/view.h" 15 #include "ui/views/view.h"
15 16
16 namespace gfx { 17 namespace gfx {
17 class Rect; 18 class Rect;
18 } 19 }
19 20
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 void OnLayerAnimationEnded(ui::LayerAnimationSequence* sequence) override; 52 void OnLayerAnimationEnded(ui::LayerAnimationSequence* sequence) override;
52 void OnLayerAnimationAborted(ui::LayerAnimationSequence* sequence) override; 53 void OnLayerAnimationAborted(ui::LayerAnimationSequence* sequence) override;
53 void OnLayerAnimationScheduled(ui::LayerAnimationSequence* sequence) override; 54 void OnLayerAnimationScheduled(ui::LayerAnimationSequence* sequence) override;
54 55
55 views::Widget* widget_for_testing(); 56 views::Widget* widget_for_testing();
56 void ClickDismissButtonForTesting(const ui::Event& event); 57 void ClickDismissButtonForTesting(const ui::Event& event);
57 58
58 bool is_visible_ = false; 59 bool is_visible_ = false;
59 Delegate* const delegate_; 60 Delegate* const delegate_;
60 const std::string text_; 61 const std::string text_;
61 scoped_ptr<views::Widget> overlay_widget_; 62 std::unique_ptr<views::Widget> overlay_widget_;
62 scoped_ptr<ToastOverlayView> overlay_view_; 63 std::unique_ptr<ToastOverlayView> overlay_view_;
63 gfx::Size widget_size_; 64 gfx::Size widget_size_;
64 65
65 DISALLOW_COPY_AND_ASSIGN(ToastOverlay); 66 DISALLOW_COPY_AND_ASSIGN(ToastOverlay);
66 }; 67 };
67 68
68 } // namespace ash 69 } // namespace ash
69 70
70 #endif // ASH_SYSTEM_TOAST_TOAST_OVERLAY_H_ 71 #endif // ASH_SYSTEM_TOAST_TOAST_OVERLAY_H_
OLDNEW
« no previous file with comments | « ash/system/toast/toast_manager_unittest.cc ('k') | ash/system/tray/default_system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698