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

Unified Diff: content/browser/compositor/browser_compositor_output_surface.h

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_output_surface.h
diff --git a/content/browser/compositor/browser_compositor_output_surface.h b/content/browser/compositor/browser_compositor_output_surface.h
index 9ea5c719ccbd65a3740edffcddb8636ff0151051..c5ddab1b639f49cf9e30973f39a9ca92fdab67aa 100644
--- a/content/browser/compositor/browser_compositor_output_surface.h
+++ b/content/browser/compositor/browser_compositor_output_surface.h
@@ -5,8 +5,9 @@
#ifndef CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
#define CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/threading/non_thread_safe.h"
#include "build/build_config.h"
#include "cc/output/output_surface.h"
@@ -69,12 +70,12 @@ class CONTENT_EXPORT BrowserCompositorOutputSurface
const scoped_refptr<cc::ContextProvider>& context,
const scoped_refptr<cc::ContextProvider>& worker_context,
const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,
- scoped_ptr<BrowserCompositorOverlayCandidateValidator>
+ std::unique_ptr<BrowserCompositorOverlayCandidateValidator>
overlay_candidate_validator);
// Constructor used by the software implementation.
BrowserCompositorOutputSurface(
- scoped_ptr<cc::SoftwareOutputDevice> software_device,
+ std::unique_ptr<cc::SoftwareOutputDevice> software_device,
const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager);
scoped_refptr<ui::CompositorVSyncManager> vsync_manager_;
@@ -86,7 +87,7 @@ class CONTENT_EXPORT BrowserCompositorOutputSurface
private:
void Initialize();
- scoped_ptr<BrowserCompositorOverlayCandidateValidator>
+ std::unique_ptr<BrowserCompositorOverlayCandidateValidator>
overlay_candidate_validator_;
DISALLOW_COPY_AND_ASSIGN(BrowserCompositorOutputSurface);
« no previous file with comments | « content/browser/cocoa/system_hotkey_helper_mac.h ('k') | content/browser/compositor/browser_compositor_output_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698