chrome/browser/chromeos/app_mode/startup_app_launcher.cc - 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/startup_app_launcher.cc

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

Index: chrome/browser/chromeos/app_mode/startup_app_launcher.cc

diff --git a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc

index fed5be6a4a32b4684c5614218717ac9486449978..2f67c0e956d69c9900ab30d31ef02949219e422b 100644

--- a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc

+++ b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc

@@ -125,9 +125,9 @@ void StartupAppLauncher::LoadOAuthFileOnBlockingPool(

base::FilePath user_data_dir;

CHECK(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));

base::FilePath auth_file = user_data_dir.Append(kOAuthFileName);

- scoped_ptr<JSONFileValueDeserializer> deserializer(

+ std::unique_ptr<JSONFileValueDeserializer> deserializer(

new JSONFileValueDeserializer(user_data_dir.Append(kOAuthFileName)));

- scoped_ptr<base::Value> value =

+ std::unique_ptr<base::Value> value =

deserializer->Deserialize(&error_code, &error_msg);

base::DictionaryValue* dict = NULL;

if (error_code != JSONFileValueDeserializer::JSON_NO_ERROR ||

« no previous file with comments | « chrome/browser/chromeos/app_mode/kiosk_profile_loader.h ('k') | chrome/browser/chromeos/arc/arc_auth_notification.cc » ('j') | no next file with comments »