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

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

Issue 2973313002: Chrome Cleanup: re-open settings post-cleanup if reboot is needed (Closed)
Patch Set: navigation_util -> navigation_util_win since not used on other platforms Created 3 years, 5 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 <windows.h> 7 #include <windows.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/bind_helpers.h" 12 #include "base/bind_helpers.h"
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/files/file_util.h" 14 #include "base/files/file_util.h"
15 #include "base/location.h" 15 #include "base/location.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/memory/ptr_util.h" 17 #include "base/memory/ptr_util.h"
18 #include "base/metrics/histogram_macros.h" 18 #include "base/metrics/histogram_macros.h"
19 #include "base/task_scheduler/post_task.h" 19 #include "base/task_scheduler/post_task.h"
20 #include "base/task_scheduler/task_traits.h" 20 #include "base/task_scheduler/task_traits.h"
21 #include "base/threading/thread_restrictions.h" 21 #include "base/threading/thread_restrictions.h"
22 #include "base/threading/thread_task_runner_handle.h" 22 #include "base/threading/thread_task_runner_handle.h"
23 #include "chrome/browser/browser_process.h" 23 #include "chrome/browser/browser_process.h"
24 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" 24 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
25 #include "chrome/browser/profiles/profile.h" 25 #include "chrome/browser/profiles/profile.h"
26 #include "chrome/browser/profiles/profile_manager.h" 26 #include "chrome/browser/profiles/profile_manager.h"
27 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win .h" 27 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win .h"
28 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_navigation_ util_win.h"
28 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win. h" 29 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win. h"
29 #include "chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.h" 30 #include "chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.h"
30 #include "chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.h" 31 #include "chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.h"
31 #include "chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.h" 32 #include "chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.h"
33 #include "chrome/browser/ui/browser.h"
32 #include "chrome/installer/util/scoped_token_privilege.h" 34 #include "chrome/installer/util/scoped_token_privilege.h"
33 #include "components/chrome_cleaner/public/constants/constants.h" 35 #include "components/chrome_cleaner/public/constants/constants.h"
34 #include "components/safe_browsing/common/safe_browsing_prefs.h" 36 #include "components/safe_browsing/common/safe_browsing_prefs.h"
35 #include "content/public/browser/browser_thread.h" 37 #include "content/public/browser/browser_thread.h"
36 #include "net/http/http_status_code.h" 38 #include "net/http/http_status_code.h"
39 #include "ui/base/window_open_disposition.h"
37 40
38 namespace safe_browsing { 41 namespace safe_browsing {
39 42
40 namespace { 43 namespace {
41 44
42 using ::chrome_cleaner::mojom::ChromePrompt; 45 using ::chrome_cleaner::mojom::ChromePrompt;
43 using ::chrome_cleaner::mojom::PromptAcceptance; 46 using ::chrome_cleaner::mojom::PromptAcceptance;
44 using ::content::BrowserThread; 47 using ::content::BrowserThread;
45 48
46 // The global singleton instance. Exposed outside of GetInstance() so that it 49 // The global singleton instance. Exposed outside of GetInstance() so that it
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 507
505 DCHECK_EQ(State::kCleaning, state()); 508 DCHECK_EQ(State::kCleaning, state());
506 DCHECK_NE(ChromeCleanerRunner::LaunchStatus::kLaunchFailed, 509 DCHECK_NE(ChromeCleanerRunner::LaunchStatus::kLaunchFailed,
507 process_status.launch_status); 510 process_status.launch_status);
508 511
509 if (process_status.launch_status == 512 if (process_status.launch_status ==
510 ChromeCleanerRunner::LaunchStatus::kSuccess) { 513 ChromeCleanerRunner::LaunchStatus::kSuccess) {
511 if (process_status.exit_code == kRebootRequiredExitCode) { 514 if (process_status.exit_code == kRebootRequiredExitCode) {
512 RecordCleanupResultHistogram(CLEANUP_RESULT_REBOOT_REQUIRED); 515 RecordCleanupResultHistogram(CLEANUP_RESULT_REBOOT_REQUIRED);
513 SetStateAndNotifyObservers(State::kRebootRequired); 516 SetStateAndNotifyObservers(State::kRebootRequired);
517
518 Browser* browser = chrome_cleaner_util::FindBrowser();
519 if (browser)
520 chrome_cleaner_util::OpenSettingsPage(
521 browser, WindowOpenDisposition::NEW_BACKGROUND_TAB,
522 /*skip_if_current_tab=*/true);
514 return; 523 return;
515 } 524 }
516 525
517 if (process_status.exit_code == kRebootNotRequiredExitCode) { 526 if (process_status.exit_code == kRebootNotRequiredExitCode) {
518 RecordCleanupResultHistogram(CLEANUP_RESULT_SUCCEEDED); 527 RecordCleanupResultHistogram(CLEANUP_RESULT_SUCCEEDED);
519 delegate_->ResetTaggedProfiles( 528 delegate_->ResetTaggedProfiles(
520 g_browser_process->profile_manager()->GetLoadedProfiles(), 529 g_browser_process->profile_manager()->GetLoadedProfiles(),
521 base::BindOnce(&ChromeCleanerController::OnSettingsResetCompleted, 530 base::BindOnce(&ChromeCleanerController::OnSettingsResetCompleted,
522 base::Unretained(this))); 531 base::Unretained(this)));
523 ResetCleanerDataAndInvalidateWeakPtrs(); 532 ResetCleanerDataAndInvalidateWeakPtrs();
(...skipping 19 matching lines...) Expand all
543 observer.OnRebootFailed(); 552 observer.OnRebootFailed();
544 } 553 }
545 } 554 }
546 555
547 void ChromeCleanerController::OnSettingsResetCompleted() { 556 void ChromeCleanerController::OnSettingsResetCompleted() {
548 idle_reason_ = IdleReason::kCleaningSucceeded; 557 idle_reason_ = IdleReason::kCleaningSucceeded;
549 SetStateAndNotifyObservers(State::kIdle); 558 SetStateAndNotifyObservers(State::kIdle);
550 } 559 }
551 560
552 } // namespace safe_browsing 561 } // namespace safe_browsing
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698