chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_win.cc - Issue 2973313002: Chrome Cleanup: re-open settings post-cleanup if reboot is needed

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/safe_browsing/BUILD.gn ('k') | chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_dialog_controller_impl_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_win.cc

diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_win.cc

index cb9d883e6f471327169b1dc902b7f390aa6206f9..b0f2d24b053f66ac063187c71e2f42d9bac70f1a 100644

--- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_win.cc

+++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_win.cc

@@ -25,15 +25,18 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win.h"

+#include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_navigation_util_win.h"

#include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.h"

#include "chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.h"

#include "chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.h"

#include "chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.h"

+#include "chrome/browser/ui/browser.h"

#include "chrome/installer/util/scoped_token_privilege.h"

#include "components/chrome_cleaner/public/constants/constants.h"

#include "components/safe_browsing/common/safe_browsing_prefs.h"

#include "content/public/browser/browser_thread.h"

#include "net/http/http_status_code.h"

+#include "ui/base/window_open_disposition.h"

namespace safe_browsing {

@@ -511,6 +514,12 @@ void ChromeCleanerController::OnCleanerProcessDone(

if (process_status.exit_code == kRebootRequiredExitCode) {

RecordCleanupResultHistogram(CLEANUP_RESULT_REBOOT_REQUIRED);

SetStateAndNotifyObservers(State::kRebootRequired);

+ Browser* browser = chrome_cleaner_util::FindBrowser();

+ if (browser)

+ chrome_cleaner_util::OpenSettingsPage(

+ browser, WindowOpenDisposition::NEW_BACKGROUND_TAB,

+ /*skip_if_current_tab=*/true);

return;

}