chrome/browser/ui/webui/chromeos/login/demo_mode_detector.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/webui/chromeos/login/demo_mode_detector.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/webui/chromeos/login/core_oobe_handler.h ('k') | chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h

diff --git a/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h b/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h

index 09848f7827d88892fcecdc50e5455a917337664c..0af89e4eb9f47455490d5cd10e631b5c6fe3755e 100644

--- a/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h

+++ b/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h

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

#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_DEMO_MODE_DETECTOR_H_

#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_DEMO_MODE_DETECTOR_H_

+#include <memory>

#include <string>

#include "base/macros.h"

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

#include "base/memory/weak_ptr.h"

#include "base/time/time.h"

#include "base/timer/timer.h"

@@ -42,7 +42,7 @@ class DemoModeDetector {

// Total time this machine has spent on OOBE.

base::TimeDelta time_on_oobe_;

- scoped_ptr<IdleDetector> idle_detector_;

+ std::unique_ptr<IdleDetector> idle_detector_;

base::RepeatingTimer oobe_timer_;