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

Index: chrome/browser/chromeos/login/existing_user_controller.cc

diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc

index 77d49397ac23909a2277acd4e8d2729e965236d5..0ffe89c15a6cf6a2d13f371da299f21c65f833fa 100644

--- a/chrome/browser/chromeos/login/existing_user_controller.cc

+++ b/chrome/browser/chromeos/login/existing_user_controller.cc

@@ -4,6 +4,7 @@

#include "chrome/browser/chromeos/login/existing_user_controller.h"

+#include <memory>

#include <vector>

#include "base/bind.h"

@@ -11,7 +12,6 @@

#include "base/callback.h"

#include "base/command_line.h"

#include "base/logging.h"

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

#include "base/message_loop/message_loop.h"

#include "base/metrics/histogram_macros.h"

#include "base/strings/string_util.h"

@@ -1023,7 +1023,7 @@ void ExistingUserController::SendAccessibilityAlert(

void ExistingUserController::SetPublicSessionKeyboardLayoutAndLogin(

const UserContext& user_context,

- scoped_ptr<base::ListValue> keyboard_layouts) {

+ std::unique_ptr<base::ListValue> keyboard_layouts) {

UserContext new_user_context = user_context;

std::string keyboard_layout;

for (size_t i = 0; i < keyboard_layouts->GetSize(); ++i) {