chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc - Issue 1865213004: Convert //chrome/browser/ui 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/ui/webui/options/chromeos/accounts_options_handler.cc

Issue 1865213004: Convert //chrome/browser/ui 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/ui/webui/options/certificate_manager_handler.cc ('k') | chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc

index 103b4c4618142a61cf8b726e85af79988b86ec4d..167ef934b4e3c984771751dab317707aa54bdf43 100644

--- a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc

@@ -6,12 +6,12 @@

#include <stddef.h>

+#include <memory>

#include <string>

#include "base/bind.h"

#include "base/bind_helpers.h"

#include "base/json/json_reader.h"

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

#include "base/strings/utf_string_conversions.h"

#include "base/values.h"

#include "chrome/browser/browser_process.h"

@@ -142,7 +142,7 @@ void AccountsOptionsHandler::HandleUpdateWhitelist(

// Creates one list to set. This is needed because user white list update is

// asynchronous and sequential. Before previous write comes back, cached list

// is stale and should not be used for appending. See http://crbug.com/127215

- scoped_ptr<base::ListValue> new_list;

+ std::unique_ptr<base::ListValue> new_list;

CrosSettings* cros_settings = CrosSettings::Get();

const base::ListValue* existing = NULL;