Index: chrome/browser/ui/zoom/chrome_zoom_level_prefs.h |
diff --git a/chrome/browser/ui/zoom/chrome_zoom_level_prefs.h b/chrome/browser/ui/zoom/chrome_zoom_level_prefs.h |
index 1b750867b24fc6eeaf6fe1cc8f4af9aaff43bdeb..ad244acb5892c24f8a691637209d10aae3103bc3 100644 |
--- a/chrome/browser/ui/zoom/chrome_zoom_level_prefs.h |
+++ b/chrome/browser/ui/zoom/chrome_zoom_level_prefs.h |
@@ -52,8 +52,8 @@ class ChromeZoomLevelPrefs : public content::ZoomLevelDelegate { |
void SetDefaultZoomLevelPref(double level); |
double GetDefaultZoomLevelPref() const; |
- scoped_ptr<DefaultZoomLevelSubscription> RegisterDefaultZoomLevelCallback( |
- const base::Closure& callback); |
+ std::unique_ptr<DefaultZoomLevelSubscription> |
+ RegisterDefaultZoomLevelCallback(const base::Closure& callback); |
void ExtractPerHostZoomLevels( |
const base::DictionaryValue* host_zoom_dictionary, |
@@ -71,7 +71,7 @@ class ChromeZoomLevelPrefs : public content::ZoomLevelDelegate { |
PrefService* pref_service_; |
base::WeakPtr<ui_zoom::ZoomEventManager> zoom_event_manager_; |
content::HostZoomMap* host_zoom_map_; |
- scoped_ptr<content::HostZoomMap::Subscription> zoom_subscription_; |
+ std::unique_ptr<content::HostZoomMap::Subscription> zoom_subscription_; |
std::string partition_key_; |
base::CallbackList<void(void)> default_zoom_changed_callbacks_; |