| Index: content/public/browser/host_zoom_map.h
|
| diff --git a/content/public/browser/host_zoom_map.h b/content/public/browser/host_zoom_map.h
|
| index 9146db39f1e7a26e337e47ea7802b565e2eb2463..b5f8e14cebf9bc7147643661b715653148d065d6 100644
|
| --- a/content/public/browser/host_zoom_map.h
|
| +++ b/content/public/browser/host_zoom_map.h
|
| @@ -6,12 +6,12 @@
|
| #define CONTENT_PUBLIC_BROWSER_HOST_ZOOM_MAP_H_
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/callback.h"
|
| #include "base/callback_list.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "content/common/content_export.h"
|
| #include "url/gurl.h"
|
|
|
| @@ -171,7 +171,7 @@ class HostZoomMap {
|
| typedef base::CallbackList<void(const ZoomLevelChange&)>::Subscription
|
| Subscription;
|
| // Add and remove zoom level changed callbacks.
|
| - virtual scoped_ptr<Subscription> AddZoomLevelChangedCallback(
|
| + virtual std::unique_ptr<Subscription> AddZoomLevelChangedCallback(
|
| const ZoomLevelChangedCallback& callback) = 0;
|
|
|
| protected:
|
|
|