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

Index: chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc

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

index 42e5bf6a820fa1282cc3f7c8ad6f4abb8f9103d9..5ac50bd4f1d502b5fe70ebcf6c7ac7ae4a0044f0 100644

--- a/chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc

+++ b/chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc

@@ -4,12 +4,12 @@

#include "chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h"

+#include <memory>

#include <utility>

#include "base/bind.h"

#include "base/location.h"

#include "base/logging.h"

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

#include "base/message_loop/message_loop.h"

#include "base/strings/utf_string_conversions.h"

#include "base/values.h"

@@ -167,7 +167,7 @@ void ChromeUserSelectionScreen::SetPublicSessionLocales(

// Construct the list of available locales. This list consists of the

// recommended locales, followed by all others.

- scoped_ptr<base::ListValue> available_locales =

+ std::unique_ptr<base::ListValue> available_locales =

GetUILanguageList(&recommended_locales, std::string());

// Set the initially selected locale to the first recommended locale that is