ash/system/toast/toast_manager.h - Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/system/toast/toast_manager.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:

Index: ash/system/toast/toast_manager.h

diff --git a/ash/system/toast/toast_manager.h b/ash/system/toast/toast_manager.h

index 4e1fc80bad144ed1c1a547b7f2adca221a116132..d46832d383f7a2a6cc1809283b211b5f11b9f5bc 100644

--- a/ash/system/toast/toast_manager.h

+++ b/ash/system/toast/toast_manager.h

@@ -5,6 +5,7 @@

#ifndef ASH_SYSTEM_TOAST_TOAST_MANAGER_H_

#define ASH_SYSTEM_TOAST_TOAST_MANAGER_H_

+#include <memory>

#include <queue>

#include <string>

@@ -41,7 +42,7 @@ class ASH_EXPORT ToastManager : public ToastOverlay::Delegate {

int toast_id_ = 0;

std::queue<std::pair<std::string, uint64_t>> queue_;

- scoped_ptr<ToastOverlay> overlay_;

+ std::unique_ptr<ToastOverlay> overlay_;

base::WeakPtrFactory<ToastManager> weak_ptr_factory_;