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

Unified Diff: content/browser/host_zoom_level_context.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
« no previous file with comments | « content/browser/gpu/shader_disk_cache.cc ('k') | content/browser/host_zoom_level_context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/host_zoom_level_context.h
diff --git a/content/browser/host_zoom_level_context.h b/content/browser/host_zoom_level_context.h
index e45222f7f826ca0a3cb14e85599347a23221a217..3120c03267bef0ff3c65d6d4536b0aa0fc375e90 100644
--- a/content/browser/host_zoom_level_context.h
+++ b/content/browser/host_zoom_level_context.h
@@ -5,9 +5,10 @@
#ifndef CONTENT_BROWSER_HOST_ZOOM_LEVEL_CONTEXT_H_
#define CONTENT_BROWSER_HOST_ZOOM_LEVEL_CONTEXT_H_
+#include <memory>
+
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "content/browser/host_zoom_map_impl.h"
#include "content/public/browser/zoom_level_delegate.h"
@@ -24,7 +25,7 @@ class HostZoomLevelContext
HostZoomLevelContextDeleter> {
public:
explicit HostZoomLevelContext(
- scoped_ptr<ZoomLevelDelegate> zoom_level_delegate);
+ std::unique_ptr<ZoomLevelDelegate> zoom_level_delegate);
HostZoomMap* GetHostZoomMap() const { return host_zoom_map_impl_.get(); }
ZoomLevelDelegate* GetZoomLevelDelegate() const {
@@ -42,10 +43,10 @@ class HostZoomLevelContext
void DeleteOnCorrectThread() const;
- scoped_ptr<HostZoomMapImpl> host_zoom_map_impl_;
+ std::unique_ptr<HostZoomMapImpl> host_zoom_map_impl_;
// Release the delegate before the HostZoomMap, in case it is carrying
// any HostZoomMap::Subscription pointers.
- scoped_ptr<ZoomLevelDelegate> zoom_level_delegate_;
+ std::unique_ptr<ZoomLevelDelegate> zoom_level_delegate_;
DISALLOW_COPY_AND_ASSIGN(HostZoomLevelContext);
};
« no previous file with comments | « content/browser/gpu/shader_disk_cache.cc ('k') | content/browser/host_zoom_level_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698