diff options
| author | dpapad <dpapad@chromium.org> | 2016-01-05 15:41:45 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-05 23:42:37 +0000 |
| commit | 8f3de04bd06fe5898c7962e53889c2019d06f663 (patch) | |
| tree | 1c462ba8b6cc04c55d533531084533413638c371 | |
| parent | 657e324bd12764c210d225d0f3c1ae1b8825d321 (diff) | |
| download | chromium_src-8f3de04bd06fe5898c7962e53889c2019d06f663.zip chromium_src-8f3de04bd06fe5898c7962e53889c2019d06f663.tar.gz chromium_src-8f3de04bd06fe5898c7962e53889c2019d06f663.tar.bz2 | |
Changing usage of SupportsWeakPtr to WeakPtrFactory in ResetSettingsHandler.
BUG=546840
Review URL: https://codereview.chromium.org/1564463002
Cr-Commit-Position: refs/heads/master@{#367694}
| -rw-r--r-- | chrome/browser/ui/webui/settings/reset_settings_handler.cc | 13 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/settings/reset_settings_handler.h | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler.cc b/chrome/browser/ui/webui/settings/reset_settings_handler.cc index 238a006..50f42b4 100644 --- a/chrome/browser/ui/webui/settings/reset_settings_handler.cc +++ b/chrome/browser/ui/webui/settings/reset_settings_handler.cc @@ -49,7 +49,8 @@ namespace settings { ResetSettingsHandler::ResetSettingsHandler( - Profile* profile, bool allow_powerwash) : profile_(profile) { + Profile* profile, bool allow_powerwash) + : profile_(profile), weak_ptr_factory_(this) { #if defined(OS_CHROMEOS) allow_powerwash_ = allow_powerwash; #endif // defined(OS_CHROMEOS) @@ -119,7 +120,7 @@ void ResetSettingsHandler::HandleResetProfileSettings( // Reset once the prefs are fetched. config_fetcher_->SetCallback( base::Bind(&ResetSettingsHandler::ResetProfile, - Unretained(this), + base::Unretained(this), send_settings)); } else { ResetProfile(send_settings); @@ -153,7 +154,8 @@ void ResetSettingsHandler::OnShowResetProfileDialog( if (!GetResetter()->IsActive()) { setting_snapshot_.reset(new ResettableSettingsSnapshot(profile_)); setting_snapshot_->RequestShortcuts(base::Bind( - &ResetSettingsHandler::UpdateFeedbackUI, AsWeakPtr())); + &ResetSettingsHandler::UpdateFeedbackUI, + weak_ptr_factory_.GetWeakPtr())); UpdateFeedbackUI(); } @@ -161,7 +163,7 @@ void ResetSettingsHandler::OnShowResetProfileDialog( return; config_fetcher_.reset(new BrandcodeConfigFetcher( base::Bind(&ResetSettingsHandler::OnSettingsFetched, - Unretained(this)), + base::Unretained(this)), GURL("https://tools.google.com/service/update2"), brandcode_)); } @@ -202,7 +204,8 @@ void ResetSettingsHandler::ResetProfile(bool send_settings) { GetResetter()->Reset( ProfileResetter::ALL, std::move(default_settings), - base::Bind(&ResetSettingsHandler::OnResetProfileSettingsDone, AsWeakPtr(), + base::Bind(&ResetSettingsHandler::OnResetProfileSettingsDone, + weak_ptr_factory_.GetWeakPtr(), send_settings)); content::RecordAction(base::UserMetricsAction("ResetProfile")); UMA_HISTOGRAM_BOOLEAN("ProfileReset.SendFeedback", send_settings); diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler.h b/chrome/browser/ui/webui/settings/reset_settings_handler.h index a6e39e1..aa27c8f 100644 --- a/chrome/browser/ui/webui/settings/reset_settings_handler.h +++ b/chrome/browser/ui/webui/settings/reset_settings_handler.h @@ -33,9 +33,7 @@ namespace settings { // Handler for // 1) 'Reset Profile Settings' dialog // 2) 'Powerwash' dialog (ChromeOS only) -class ResetSettingsHandler - : public SettingsPageUIHandler, - public base::SupportsWeakPtr<ResetSettingsHandler> { +class ResetSettingsHandler : public SettingsPageUIHandler { public: ~ResetSettingsHandler() override; @@ -101,6 +99,8 @@ class ResetSettingsHandler // Contains Chrome brand code; empty for organic Chrome. std::string brandcode_; + base::WeakPtrFactory<ResetSettingsHandler> weak_ptr_factory_; + DISALLOW_COPY_AND_ASSIGN(ResetSettingsHandler); }; |