chrome/browser/chromeos/net/proxy_config_handler.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/net/proxy_config_handler.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

Index: chrome/browser/chromeos/net/proxy_config_handler.h

diff --git a/chrome/browser/chromeos/net/proxy_config_handler.h b/chrome/browser/chromeos/net/proxy_config_handler.h

index e44dfbd2738340b82853b70c912b42353a95cabe..7963212dd476dff3565ff8d477670f0c40d1c2d0 100644

--- a/chrome/browser/chromeos/net/proxy_config_handler.h

+++ b/chrome/browser/chromeos/net/proxy_config_handler.h

@@ -5,7 +5,8 @@

#ifndef CHROME_BROWSER_CHROMEOS_NET_PROXY_CONFIG_HANDLER_H_

#define CHROME_BROWSER_CHROMEOS_NET_PROXY_CONFIG_HANDLER_H_

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

+#include <memory>

#include "components/onc/onc_constants.h"

class PrefRegistrySimple;

@@ -26,7 +27,7 @@ namespace proxy_config {

// |network|. If |profile_prefs| is NULL, then only shared settings (and device

// policy) are respected. This is e.g. the case for the signin screen and the

// system request context.

-scoped_ptr<ProxyConfigDictionary> GetProxyConfigForNetwork(

+std::unique_ptr<ProxyConfigDictionary> GetProxyConfigForNetwork(

const PrefService* profile_prefs,

const PrefService* local_state_prefs,

const NetworkState& network,

« no previous file with comments | « chrome/browser/chromeos/net/onc_utils.cc ('k') | chrome/browser/chromeos/net/proxy_config_handler.cc » ('j') | no next file with comments »