chrome/browser/first_run/first_run.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/first_run/first_run.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

« no previous file with comments | « chrome/browser/external_protocol/external_protocol_handler_unittest.cc ('k') | chrome/browser/shell_integration.h » ('j') | chrome/browser/shell_integration.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/first_run/first_run.cc

diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc

index 734711c935278c3c19d41bb751f88eacfbf13dda..dbe860660cce8a081c956189bffb7aae37df0c64 100644

--- a/chrome/browser/first_run/first_run.cc

+++ b/chrome/browser/first_run/first_run.cc

@@ -463,9 +463,9 @@ installer::MasterPreferences* LoadMasterPrefs() {

// Makes chrome the user's default browser according to policy or

// |make_chrome_default_for_user| if no policy is set.

void ProcessDefaultBrowserPolicy(bool make_chrome_default_for_user) {

- // Only proceed if chrome can be made default unattended. The interactive case

- // (Windows 8+) is handled by the first run default browser prompt.

- if (shell_integration::CanSetAsDefaultBrowser() ==

+ // Only proceed if chrome can be made default unattended. In other cases, this

+ // is handled by the first run default browser prompt (on Windows 8+).

+ if (shell_integration::GetDefaultWebClientSetPermission() ==

shell_integration::SET_DEFAULT_UNATTENDED) {

// The policy has precedence over the user's choice.

if (g_browser_process->local_state()->IsManagedPreference(