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

Side by Side Diff: chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_win.cc

Issue 2906103002: Post-cleanup settings reset. (Closed)
Patch Set: Addressed Nico's comments Created 3 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_ win.h" 5 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_ win.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/files/file_util.h" 12 #include "base/files/file_util.h"
13 #include "base/location.h" 13 #include "base/location.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/memory/ptr_util.h" 15 #include "base/memory/ptr_util.h"
16 #include "base/memory/singleton.h" 16 #include "base/memory/singleton.h"
17 #include "base/task_scheduler/post_task.h" 17 #include "base/task_scheduler/post_task.h"
18 #include "base/task_scheduler/task_traits.h" 18 #include "base/task_scheduler/task_traits.h"
19 #include "base/threading/thread_restrictions.h" 19 #include "base/threading/thread_restrictions.h"
20 #include "base/threading/thread_task_runner_handle.h" 20 #include "base/threading/thread_task_runner_handle.h"
21 #include "chrome/browser/browser_process.h"
21 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" 22 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
23 #include "chrome/browser/profiles/profile.h"
24 #include "chrome/browser/profiles/profile_manager.h"
22 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win .h" 25 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win .h"
23 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win. h" 26 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win. h"
27 #include "chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.h"
24 #include "chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.h" 28 #include "chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.h"
25 #include "components/chrome_cleaner/public/constants/constants.h" 29 #include "components/chrome_cleaner/public/constants/constants.h"
26 #include "components/safe_browsing/common/safe_browsing_prefs.h" 30 #include "components/safe_browsing/common/safe_browsing_prefs.h"
27 #include "content/public/browser/browser_thread.h" 31 #include "content/public/browser/browser_thread.h"
28 #include "net/http/http_status_code.h" 32 #include "net/http/http_status_code.h"
29 33
30 namespace safe_browsing { 34 namespace safe_browsing {
31 35
32 namespace { 36 namespace {
33 37
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 111
108 bool ChromeCleanerControllerDelegate:: 112 bool ChromeCleanerControllerDelegate::
109 SafeBrowsingExtendedReportingScoutEnabled() { 113 SafeBrowsingExtendedReportingScoutEnabled() {
110 return safe_browsing::SafeBrowsingExtendedReportingScoutEnabled(); 114 return safe_browsing::SafeBrowsingExtendedReportingScoutEnabled();
111 } 115 }
112 116
113 bool ChromeCleanerControllerDelegate::IsMetricsAndCrashReportingEnabled() { 117 bool ChromeCleanerControllerDelegate::IsMetricsAndCrashReportingEnabled() {
114 return ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled(); 118 return ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled();
115 } 119 }
116 120
121 void ChromeCleanerControllerDelegate::TagForResetting(Profile* profile) {
122 if (PostCleanupSettingsResetter::IsEnabled())
123 PostCleanupSettingsResetter().TagForResetting(profile);
124 }
125
126 void ChromeCleanerControllerDelegate::ResetTaggedProfiles(
127 std::vector<Profile*> profiles,
128 base::OnceClosure continuation) {
129 if (PostCleanupSettingsResetter::IsEnabled()) {
130 PostCleanupSettingsResetter().ResetTaggedProfiles(
131 std::move(profiles), std::move(continuation),
132 base::MakeUnique<PostCleanupSettingsResetter::Delegate>());
133 }
134 }
135
117 // static 136 // static
118 ChromeCleanerController* ChromeCleanerController::GetInstance() { 137 ChromeCleanerController* ChromeCleanerController::GetInstance() {
119 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 138 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
120 g_instance_exists = true; 139 g_instance_exists = true;
121 return base::Singleton<ChromeCleanerController>::get(); 140 return base::Singleton<ChromeCleanerController>::get();
122 } 141 }
123 142
124 // static 143 // static
125 bool ChromeCleanerController::ShouldShowCleanupInSettingsUI() { 144 bool ChromeCleanerController::ShouldShowCleanupInSettingsUI() {
126 // Short-circuit if the instance doesn't exist to avoid creating it during 145 // Short-circuit if the instance doesn't exist to avoid creating it during
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 DCHECK(!reporter_invocation_); 183 DCHECK(!reporter_invocation_);
165 reporter_invocation_ = 184 reporter_invocation_ =
166 base::MakeUnique<SwReporterInvocation>(reporter_invocation); 185 base::MakeUnique<SwReporterInvocation>(reporter_invocation);
167 SetStateAndNotifyObservers(State::kScanning); 186 SetStateAndNotifyObservers(State::kScanning);
168 delegate_->FetchAndVerifyChromeCleaner(base::BindOnce( 187 delegate_->FetchAndVerifyChromeCleaner(base::BindOnce(
169 &ChromeCleanerController::OnChromeCleanerFetchedAndVerified, 188 &ChromeCleanerController::OnChromeCleanerFetchedAndVerified,
170 base::Unretained(this))); 189 base::Unretained(this)));
171 } 190 }
172 191
173 void ChromeCleanerController::ReplyWithUserResponse( 192 void ChromeCleanerController::ReplyWithUserResponse(
193 Profile* profile,
174 UserResponse user_response) { 194 UserResponse user_response) {
175 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 195 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
176 DCHECK(prompt_user_callback_); 196 DCHECK(prompt_user_callback_);
177 197
178 if (state() != State::kInfected) 198 if (state() != State::kInfected)
179 return; 199 return;
180 200
181 PromptAcceptance acceptance = PromptAcceptance::DENIED; 201 PromptAcceptance acceptance = PromptAcceptance::DENIED;
182 State new_state = State::kIdle; 202 State new_state = State::kIdle;
183 switch (user_response) { 203 switch (user_response) {
184 case UserResponse::kAccepted: 204 case UserResponse::kAccepted:
185 acceptance = PromptAcceptance::ACCEPTED; 205 acceptance = PromptAcceptance::ACCEPTED;
186 new_state = State::kCleaning; 206 new_state = State::kCleaning;
207 delegate_->TagForResetting(profile);
187 break; 208 break;
188 case UserResponse::kDenied: // Fallthrough 209 case UserResponse::kDenied: // Fallthrough
189 case UserResponse::kDismissed: 210 case UserResponse::kDismissed:
190 acceptance = PromptAcceptance::DENIED; 211 acceptance = PromptAcceptance::DENIED;
191 idle_reason_ = IdleReason::kUserDeclinedCleanup; 212 idle_reason_ = IdleReason::kUserDeclinedCleanup;
192 new_state = State::kIdle; 213 new_state = State::kIdle;
193 break; 214 break;
194 } 215 }
195 216
196 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO) 217 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 SetStateAndNotifyObservers(State::kIdle); 393 SetStateAndNotifyObservers(State::kIdle);
373 return; 394 return;
374 } 395 }
375 396
376 if (process_status.exit_code == kRebootRequiredExitCode) { 397 if (process_status.exit_code == kRebootRequiredExitCode) {
377 SetStateAndNotifyObservers(State::kRebootRequired); 398 SetStateAndNotifyObservers(State::kRebootRequired);
378 return; 399 return;
379 } 400 }
380 401
381 if (process_status.exit_code == kRebootNotRequiredExitCode) { 402 if (process_status.exit_code == kRebootNotRequiredExitCode) {
382 idle_reason_ = IdleReason::kCleaningSucceeded; 403 delegate_->ResetTaggedProfiles(
383 SetStateAndNotifyObservers(State::kIdle); 404 g_browser_process->profile_manager()->GetLoadedProfiles(),
405 base::BindOnce(&ChromeCleanerController::OnSettingsResetCompleted,
406 base::Unretained(this)));
407 ResetCleanerDataAndInvalidateWeakPtrs();
384 return; 408 return;
385 } 409 }
386 410
387 idle_reason_ = IdleReason::kCleaningFailed; 411 idle_reason_ = IdleReason::kCleaningFailed;
388 SetStateAndNotifyObservers(State::kIdle); 412 SetStateAndNotifyObservers(State::kIdle);
389 } 413 }
390 414
415 void ChromeCleanerController::OnSettingsResetCompleted() {
416 idle_reason_ = IdleReason::kCleaningSucceeded;
417 SetStateAndNotifyObservers(State::kIdle);
418 }
419
391 } // namespace safe_browsing 420 } // namespace safe_browsing
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698