Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(319)

Unified Diff: content/browser/compositor/browser_compositor_overlay_candidate_validator_ozone.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
Index: content/browser/compositor/browser_compositor_overlay_candidate_validator_ozone.cc
diff --git a/content/browser/compositor/browser_compositor_overlay_candidate_validator_ozone.cc b/content/browser/compositor/browser_compositor_overlay_candidate_validator_ozone.cc
index dae75cf5d86b5969e546de922f3c47ff678495cb..97f2d9265392862a36cc8971743e3604ebd60ff2 100644
--- a/content/browser/compositor/browser_compositor_overlay_candidate_validator_ozone.cc
+++ b/content/browser/compositor/browser_compositor_overlay_candidate_validator_ozone.cc
@@ -5,8 +5,10 @@
#include "content/browser/compositor/browser_compositor_overlay_candidate_validator_ozone.h"
#include <stddef.h>
+
#include <utility>
+#include "base/memory/ptr_util.h"
#include "cc/output/overlay_strategy_single_on_top.h"
#include "cc/output/overlay_strategy_underlay.h"
#include "ui/ozone/public/overlay_candidates_ozone.h"
@@ -28,7 +30,7 @@ static gfx::BufferFormat GetBufferFormat(cc::ResourceFormat overlay_format) {
BrowserCompositorOverlayCandidateValidatorOzone::
BrowserCompositorOverlayCandidateValidatorOzone(
gfx::AcceleratedWidget widget,
- scoped_ptr<ui::OverlayCandidatesOzone> overlay_candidates)
+ std::unique_ptr<ui::OverlayCandidatesOzone> overlay_candidates)
: widget_(widget),
overlay_candidates_(std::move(overlay_candidates)),
software_mirror_active_(false) {}
@@ -40,8 +42,9 @@ BrowserCompositorOverlayCandidateValidatorOzone::
void BrowserCompositorOverlayCandidateValidatorOzone::GetStrategies(
cc::OverlayProcessor::StrategyList* strategies) {
strategies->push_back(
- make_scoped_ptr(new cc::OverlayStrategySingleOnTop(this)));
- strategies->push_back(make_scoped_ptr(new cc::OverlayStrategyUnderlay(this)));
+ base::WrapUnique(new cc::OverlayStrategySingleOnTop(this)));
+ strategies->push_back(
+ base::WrapUnique(new cc::OverlayStrategyUnderlay(this)));
}
bool BrowserCompositorOverlayCandidateValidatorOzone::AllowCALayerOverlays() {

Powered by Google App Engine
This is Rietveld 408576698