components/security_interstitials/core/controller_client.h - Issue 1921923002: Convert //components/[o-t]* 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: components/security_interstitials/core/controller_client.h

Issue 1921923002: Convert //components/[o-t]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . 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 | « components/security_interstitials/core/bad_clock_ui.h ('k') | components/security_interstitials/core/controller_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/security_interstitials/core/controller_client.h

diff --git a/components/security_interstitials/core/controller_client.h b/components/security_interstitials/core/controller_client.h

index 03af2e711d9c9a2d159eae616bada3f79453f10d..2aced84ce84fba50fe5cecb95dcd86ba19eaccc1 100644

--- a/components/security_interstitials/core/controller_client.h

+++ b/components/security_interstitials/core/controller_client.h

@@ -5,10 +5,10 @@

#ifndef COMPONENTS_SECURITY_INTERSTITIALS_CORE_CONTROLLER_CLIENT_H_

#define COMPONENTS_SECURITY_INTERSTITIALS_CORE_CONTROLLER_CLIENT_H_

+#include <memory>

#include <string>

#include "base/macros.h"

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

class GURL;

class PrefService;

@@ -76,7 +76,7 @@ class ControllerClient {

virtual void Reload() = 0;

MetricsHelper* metrics_helper() const;

- void set_metrics_helper(scoped_ptr<MetricsHelper> metrics_helper);

+ void set_metrics_helper(std::unique_ptr<MetricsHelper> metrics_helper);

virtual void OpenUrlInCurrentTab(const GURL& url) = 0;

@@ -86,7 +86,7 @@ class ControllerClient {

virtual const std::string GetExtendedReportingPrefName() = 0;

private:

- scoped_ptr<MetricsHelper> metrics_helper_;

+ std::unique_ptr<MetricsHelper> metrics_helper_;

DISALLOW_COPY_AND_ASSIGN(ControllerClient);

};