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

Unified Diff: chrome/browser/ui/webui/settings/reset_settings_handler.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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: chrome/browser/ui/webui/settings/reset_settings_handler.h
diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler.h b/chrome/browser/ui/webui/settings/reset_settings_handler.h
index 2bbe7b538ca5ce80b0926dc737a146e445dc5e73..fefcea6389f28ca076a35bae5091070ff8ab68d0 100644
--- a/chrome/browser/ui/webui/settings/reset_settings_handler.h
+++ b/chrome/browser/ui/webui/settings/reset_settings_handler.h
@@ -5,11 +5,11 @@
#ifndef CHROME_BROWSER_UI_WEBUI_SETTINGS_RESET_SETTINGS_HANDLER_H_
#define CHROME_BROWSER_UI_WEBUI_SETTINGS_RESET_SETTINGS_HANDLER_H_
+#include <memory>
#include <string>
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "build/build_config.h"
#include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
@@ -90,12 +90,12 @@ class ResetSettingsHandler : public SettingsPageUIHandler {
Profile* const profile_;
- scoped_ptr<ProfileResetter> resetter_;
+ std::unique_ptr<ProfileResetter> resetter_;
- scoped_ptr<BrandcodeConfigFetcher> config_fetcher_;
+ std::unique_ptr<BrandcodeConfigFetcher> config_fetcher_;
// Snapshot of settings before profile was reseted.
- scoped_ptr<ResettableSettingsSnapshot> setting_snapshot_;
+ std::unique_ptr<ResettableSettingsSnapshot> setting_snapshot_;
// Contains Chrome brand code; empty for organic Chrome.
std::string brandcode_;

Powered by Google App Engine
This is Rietveld 408576698