chrome/browser/ui/webui/options/browser_options_handler.cc - Issue 1832853003: DefaultBrowserWorker now fully supports opening the settings for Win10

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/ui/webui/options/browser_options_handler.cc

Issue 1832853003: DefaultBrowserWorker now fully supports opening the settings for Win10 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix mac compilation Created 4 years, 8 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

« chrome/browser/shell_integration.cc ('K') | « chrome/browser/ui/startup/default_browser_prompt_win.cc ('k') | chrome/browser/ui/webui/settings/settings_default_browser_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/browser_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc

index 24081851bbe3931c4a4468df7f9b6ad05998ddec..fc339e5ba1ff20b3b63f73a3c4bcbcaf67e042d4 100644

--- a/chrome/browser/ui/webui/options/browser_options_handler.cc

+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc

@@ -1157,11 +1157,10 @@ void BrowserOptionsHandler::OnDefaultBrowserWorkerFinished(

// default browser.

chrome::ResetDefaultBrowserPrompt(Profile::FromWebUI(web_ui()));

} else if (state == shell_integration::NOT_DEFAULT) {

- if (shell_integration::CanSetAsDefaultBrowser() ==

- shell_integration::SET_DEFAULT_NOT_ALLOWED) {

- status_string_id = IDS_OPTIONS_DEFAULTBROWSER_SXS;

- } else {

+ if (shell_integration::CanSetAsDefaultBrowser()) {

status_string_id = IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT;

+ } else {

+ status_string_id = IDS_OPTIONS_DEFAULTBROWSER_SXS;

}

} else if (state == shell_integration::UNKNOWN_DEFAULT) {

status_string_id = IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN;