content/browser/compositor/browser_compositor_overlay_candidate_validator_android.cc - Issue 1874893002: Convert //content/browser 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: content/browser/compositor/browser_compositor_overlay_candidate_validator_android.cc

Issue 1874893002: Convert //content/browser 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 | « content/browser/compositor/browser_compositor_output_surface.cc ('k') | content/browser/compositor/browser_compositor_overlay_candidate_validator_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/browser_compositor_overlay_candidate_validator_android.cc

diff --git a/content/browser/compositor/browser_compositor_overlay_candidate_validator_android.cc b/content/browser/compositor/browser_compositor_overlay_candidate_validator_android.cc

index 4ed6af62ebdcdf76be220acb5a41fd49a58f15e8..e04a241550db95e20a08e73bbca8c7a0d9aec3ee 100644

--- a/content/browser/compositor/browser_compositor_overlay_candidate_validator_android.cc

+++ b/content/browser/compositor/browser_compositor_overlay_candidate_validator_android.cc

@@ -4,7 +4,9 @@

#include "content/browser/compositor/browser_compositor_overlay_candidate_validator_android.h"

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

+#include <memory>

+#include "base/memory/ptr_util.h"

#include "cc/output/overlay_processor.h"

#include "cc/output/overlay_strategy_underlay.h"

#include "ui/gfx/geometry/rect_conversions.h"

@@ -19,7 +21,8 @@ BrowserCompositorOverlayCandidateValidatorAndroid::

void BrowserCompositorOverlayCandidateValidatorAndroid::GetStrategies(

cc::OverlayProcessor::StrategyList* strategies) {

- strategies->push_back(make_scoped_ptr(new cc::OverlayStrategyUnderlay(this)));

+ strategies->push_back(

+ base::WrapUnique(new cc::OverlayStrategyUnderlay(this)));

}

void BrowserCompositorOverlayCandidateValidatorAndroid::CheckOverlaySupport(