summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordpapad <dpapad@chromium.org>2015-12-01 10:43:33 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-01 18:45:18 +0000
commit120054e4b5962e033ab9800f5ef304f85f2bceca (patch)
treeb6161dd7627c8caa08d902082d5d823cc930cc08
parent006dc1e53075a580f789a2b18f7a47316e217dc7 (diff)
downloadchromium_src-120054e4b5962e033ab9800f5ef304f85f2bceca.zip
chromium_src-120054e4b5962e033ab9800f5ef304f85f2bceca.tar.gz
chromium_src-120054e4b5962e033ab9800f5ef304f85f2bceca.tar.bz2
Cleanup: Remove unused boolean parameter from ProfileResetter::Reset.
The parameter was added at https://codereview.chromium.org/333193002. The code that uses the parameter was later removed at https://codereview.chromium.org/495643002, but the method signature was not cleaned up. BUG=546840 Review URL: https://codereview.chromium.org/1484113003 Cr-Commit-Position: refs/heads/master@{#362460}
-rw-r--r--chrome/browser/profile_resetter/profile_resetter.cc1
-rw-r--r--chrome/browser/profile_resetter/profile_resetter.h4
-rw-r--r--chrome/browser/profile_resetter/profile_resetter_test_base.cc2
-rw-r--r--chrome/browser/ui/webui/options/reset_profile_settings_handler.cc1
-rw-r--r--chrome/browser/ui/webui/settings/reset_settings_handler.cc1
5 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/profile_resetter/profile_resetter.cc b/chrome/browser/profile_resetter/profile_resetter.cc
index 0c2a49b..bbbf0c4 100644
--- a/chrome/browser/profile_resetter/profile_resetter.cc
+++ b/chrome/browser/profile_resetter/profile_resetter.cc
@@ -83,7 +83,6 @@ ProfileResetter::~ProfileResetter() {
void ProfileResetter::Reset(
ProfileResetter::ResettableFlags resettable_flags,
scoped_ptr<BrandcodedDefaultSettings> master_settings,
- bool accepted_send_feedback,
const base::Closure& callback) {
DCHECK(CalledOnValidThread());
DCHECK(master_settings);
diff --git a/chrome/browser/profile_resetter/profile_resetter.h b/chrome/browser/profile_resetter/profile_resetter.h
index b4044fa..31f92cd 100644
--- a/chrome/browser/profile_resetter/profile_resetter.h
+++ b/chrome/browser/profile_resetter/profile_resetter.h
@@ -60,11 +60,9 @@ class ProfileResetter : public base::NonThreadSafe,
// Resets |resettable_flags| and calls |callback| on the UI thread on
// completion. |default_settings| allows the caller to specify some default
- // settings. |default_settings| shouldn't be NULL. |accepted_send_feedback|
- // identifies whether the user accepted to send feedback or not.
+ // settings. |default_settings| shouldn't be NULL.
void Reset(ResettableFlags resettable_flags,
scoped_ptr<BrandcodedDefaultSettings> master_settings,
- bool accepted_send_feedback,
const base::Closure& callback);
bool IsActive() const;
diff --git a/chrome/browser/profile_resetter/profile_resetter_test_base.cc b/chrome/browser/profile_resetter/profile_resetter_test_base.cc
index f149672..b1e1242 100644
--- a/chrome/browser/profile_resetter/profile_resetter_test_base.cc
+++ b/chrome/browser/profile_resetter/profile_resetter_test_base.cc
@@ -35,7 +35,6 @@ void ProfileResetterTestBase::ResetAndWait(
new BrandcodedDefaultSettings);
resetter_->Reset(resettable_flags,
master_settings.Pass(),
- false,
base::Bind(&ProfileResetterMockObject::StopLoop,
base::Unretained(&mock_object_)));
mock_object_.RunLoop();
@@ -48,7 +47,6 @@ void ProfileResetterTestBase::ResetAndWait(
new BrandcodedDefaultSettings(prefs));
resetter_->Reset(resettable_flags,
master_settings.Pass(),
- false,
base::Bind(&ProfileResetterMockObject::StopLoop,
base::Unretained(&mock_object_)));
mock_object_.RunLoop();
diff --git a/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc b/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc
index 0af19b5..9f77a9a 100644
--- a/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc
@@ -204,7 +204,6 @@ void ResetProfileSettingsHandler::ResetProfile(bool send_settings) {
resetter_->Reset(
ProfileResetter::ALL,
default_settings.Pass(),
- send_settings,
base::Bind(&ResetProfileSettingsHandler::OnResetProfileSettingsDone,
AsWeakPtr(),
send_settings));
diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler.cc b/chrome/browser/ui/webui/settings/reset_settings_handler.cc
index 53b19a9..3cc4661 100644
--- a/chrome/browser/ui/webui/settings/reset_settings_handler.cc
+++ b/chrome/browser/ui/webui/settings/reset_settings_handler.cc
@@ -168,7 +168,6 @@ void ResetSettingsHandler::ResetProfile(bool send_settings) {
resetter_->Reset(
ProfileResetter::ALL,
default_settings.Pass(),
- send_settings,
base::Bind(&ResetSettingsHandler::OnResetProfileSettingsDone,
AsWeakPtr(),
send_settings));