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

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/toast/toast_overlay.h
diff --git a/ash/system/toast/toast_overlay.h b/ash/system/toast/toast_overlay.h
index 4bb3c5522c7540ef05917435db8d36dc5016f181..1cd4fa9c5cc9b45b46dcfb522a4db2cd39c95263 100644
--- a/ash/system/toast/toast_overlay.h
+++ b/ash/system/toast/toast_overlay.h
@@ -5,8 +5,9 @@
#ifndef ASH_SYSTEM_TOAST_TOAST_OVERLAY_H_
#define ASH_SYSTEM_TOAST_TOAST_OVERLAY_H_
+#include <memory>
+
#include "ash/ash_export.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/compositor/layer_animation_observer.h"
#include "ui/events/event.h"
#include "ui/events/event_constants.h"
@@ -58,8 +59,8 @@ class ASH_EXPORT ToastOverlay : public ui::LayerAnimationObserver {
bool is_visible_ = false;
Delegate* const delegate_;
const std::string text_;
- scoped_ptr<views::Widget> overlay_widget_;
- scoped_ptr<ToastOverlayView> overlay_view_;
+ std::unique_ptr<views::Widget> overlay_widget_;
+ std::unique_ptr<ToastOverlayView> overlay_view_;
gfx::Size widget_size_;
DISALLOW_COPY_AND_ASSIGN(ToastOverlay);
« 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