chrome/browser/chromeos/session_length_limiter.h - Issue 1870793002: Convert //chrome/browser/chromeos 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/chromeos/session_length_limiter.h

Issue 1870793002: Convert //chrome/browser/chromeos 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/chromeos/resource_reporter/resource_reporter_unittest.cc ('k') | chrome/browser/chromeos/session_length_limiter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/session_length_limiter.h

diff --git a/chrome/browser/chromeos/session_length_limiter.h b/chrome/browser/chromeos/session_length_limiter.h

index 996403b0c1399852de03528ab5c5dd94d8cbf3fa..343c6e56725c16e5b9a8e39e10c2a79777fa3194 100644

--- a/chrome/browser/chromeos/session_length_limiter.h

+++ b/chrome/browser/chromeos/session_length_limiter.h

@@ -5,9 +5,10 @@

#ifndef CHROME_BROWSER_CHROMEOS_SESSION_LENGTH_LIMITER_H_

#define CHROME_BROWSER_CHROMEOS_SESSION_LENGTH_LIMITER_H_

+#include <memory>

#include "base/compiler_specific.h"

#include "base/macros.h"

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

#include "base/threading/thread_checker.h"

#include "base/time/time.h"

#include "base/timer/timer.h"

@@ -60,10 +61,10 @@ class SessionLengthLimiter : public ui::UserActivityObserver {

base::ThreadChecker thread_checker_;

- scoped_ptr<Delegate> delegate_;

+ std::unique_ptr<Delegate> delegate_;

PrefChangeRegistrar pref_change_registrar_;

- scoped_ptr<base::OneShotTimer> timer_;

+ std::unique_ptr<base::OneShotTimer> timer_;

base::TimeTicks session_start_time_;

bool user_activity_seen_;