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

Unified Diff: components/ui/zoom/zoom_controller.h

Issue 1917673002: Convert //components/[u-z]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Build fix 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 | « no previous file | components/ui/zoom/zoom_event_manager.h » ('j') | components/undo/bookmark_undo_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/ui/zoom/zoom_controller.h
diff --git a/components/ui/zoom/zoom_controller.h b/components/ui/zoom/zoom_controller.h
index cffa5ae617981fc557c7a3aeb07937fab617d5c0..d8977e029af1300116b23581303d124d76b56488 100644
--- a/components/ui/zoom/zoom_controller.h
+++ b/components/ui/zoom/zoom_controller.h
@@ -5,10 +5,11 @@
#ifndef COMPONENTS_UI_ZOOM_ZOOM_CONTROLLER_H_
#define COMPONENTS_UI_ZOOM_ZOOM_CONTROLLER_H_
+#include <memory>
+
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "components/prefs/pref_member.h"
#include "content/public/browser/host_zoom_map.h"
@@ -180,7 +181,7 @@ class ZoomController : public content::WebContentsObserver,
// Current zoom level.
double zoom_level_;
- scoped_ptr<ZoomChangedEventData> event_data_;
+ std::unique_ptr<ZoomChangedEventData> event_data_;
// Keeps track of the extension (if any) that initiated the last zoom change
// that took effect.
@@ -193,7 +194,7 @@ class ZoomController : public content::WebContentsObserver,
// Keep track of the HostZoomMap we're currently subscribed to.
content::HostZoomMap* host_zoom_map_;
- scoped_ptr<content::HostZoomMap::Subscription> zoom_subscription_;
+ std::unique_ptr<content::HostZoomMap::Subscription> zoom_subscription_;
DISALLOW_COPY_AND_ASSIGN(ZoomController);
};
« no previous file with comments | « no previous file | components/ui/zoom/zoom_event_manager.h » ('j') | components/undo/bookmark_undo_service.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698