chrome/browser/chromeos/app_mode/kiosk_profile_loader.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/app_mode/kiosk_profile_loader.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/app_mode/kiosk_mode_idle_app_name_notification.h ('k') | chrome/browser/chromeos/app_mode/startup_app_launcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/app_mode/kiosk_profile_loader.h

diff --git a/chrome/browser/chromeos/app_mode/kiosk_profile_loader.h b/chrome/browser/chromeos/app_mode/kiosk_profile_loader.h

index 0b152655247a425d6e79a3a192fe998dc798f23f..e208f4c02a8eff2ee9187deca892f3471200c8d6 100644

--- a/chrome/browser/chromeos/app_mode/kiosk_profile_loader.h

+++ b/chrome/browser/chromeos/app_mode/kiosk_profile_loader.h

@@ -5,11 +5,11 @@

#ifndef CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_PROFILE_LOADER_H_

#define CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_PROFILE_LOADER_H_

+#include <memory>

#include <string>

#include "base/callback.h"

#include "base/macros.h"

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

#include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"

#include "chrome/browser/chromeos/login/session/user_session_manager.h"

#include "chromeos/login/auth/login_performer.h"

@@ -62,8 +62,8 @@ class KioskProfileLoader : public LoginPerformer::Delegate,

const AccountId account_id_;

bool use_guest_mount_;

Delegate* delegate_;

- scoped_ptr<CryptohomedChecker> cryptohomed_checker_;

- scoped_ptr<LoginPerformer> login_performer_;

+ std::unique_ptr<CryptohomedChecker> cryptohomed_checker_;

+ std::unique_ptr<LoginPerformer> login_performer_;

DISALLOW_COPY_AND_ASSIGN(KioskProfileLoader);

};