chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.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/login/easy_unlock/short_lived_user_context.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/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc ('k') | chrome/browser/chromeos/login/enable_debugging_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.h

diff --git a/chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.h b/chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.h

index f40e826771e34a7af351eb2cfbef7aa3c38bcf91..648b632182df98622cccc306b82efc6408bcb864 100644

--- a/chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.h

+++ b/chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.h

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

#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_SHORT_LIVED_USER_CONTEXT_H_

#define CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_SHORT_LIVED_USER_CONTEXT_H_

+#include <memory>

#include "apps/app_lifetime_monitor.h"

#include "base/macros.h"

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

#include "base/memory/weak_ptr.h"

namespace base {

@@ -39,7 +40,7 @@ class ShortLivedUserContext : public apps::AppLifetimeMonitor::Observer {

// apps::AppLifetimeMonitor::Observer:

void OnAppDeactivated(Profile* profile, const std::string& app_id) override;

- scoped_ptr<UserContext> user_context_;

+ std::unique_ptr<UserContext> user_context_;

apps::AppLifetimeMonitor* app_lifetime_monitor_;