chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h - Issue 1865213004: Convert //chrome/browser/ui 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: chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase 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 | « chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc ('k') | chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h

diff --git a/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h b/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h

index 9385cdafc7be756337c916faa2e528ba8077388a..8a2e2e290c68b5ad290854744e8b119d558eace7 100644

--- a/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h

+++ b/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h

@@ -6,10 +6,10 @@

#define CHROME_BROWSER_UI_ASH_MULTI_USER_USER_SWITCH_ANIMATOR_CHROMEOS_H_

#include <map>

+#include <memory>

#include <string>

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "base/timer/timer.h"

#include "components/signin/core/account_id/account_id.h"

#include "ui/aura/window.h"

@@ -116,7 +116,7 @@ class UserSwitchAnimatorChromeOS {

// A timer which watches to executes the second part of a "user changed"

// animation. Note that this timer exists only during such an animation.

- scoped_ptr<base::Timer> user_changed_animation_timer_;

+ std::unique_ptr<base::Timer> user_changed_animation_timer_;

// For unit tests: Check which wallpaper was set.

std::string wallpaper_user_id_for_test_;