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

Unified Diff: ash/system/tray/system_tray_bubble.cc

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/tray/system_tray_bubble.h ('k') | ash/system/tray/system_tray_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/system_tray_bubble.cc
diff --git a/ash/system/tray/system_tray_bubble.cc b/ash/system/tray/system_tray_bubble.cc
index eab4b1cf98a0d3fba611c8f35d8b1b3713cb410d..f51bbe19e15951f3fb73dedff506840aa6ad627d 100644
--- a/ash/system/tray/system_tray_bubble.cc
+++ b/ash/system/tray/system_tray_bubble.cc
@@ -53,7 +53,7 @@ class AnimationObserverDeleteLayer : public ui::ImplicitAnimationObserver {
}
private:
- scoped_ptr<ui::Layer> layer_;
+ std::unique_ptr<ui::Layer> layer_;
DISALLOW_COPY_AND_ASSIGN(AnimationObserverDeleteLayer);
};
@@ -85,7 +85,7 @@ void SystemTrayBubble::UpdateView(
BubbleType bubble_type) {
DCHECK(bubble_type != BUBBLE_TYPE_NOTIFICATION);
- scoped_ptr<ui::Layer> scoped_layer;
+ std::unique_ptr<ui::Layer> scoped_layer;
if (bubble_type != bubble_type_) {
base::TimeDelta swipe_duration =
base::TimeDelta::FromMilliseconds(kSwipeDelayMS);
« no previous file with comments | « ash/system/tray/system_tray_bubble.h ('k') | ash/system/tray/system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698