chrome/installer/gcapi/gcapi.cc - Issue 685103004: Refactor chrome_launcher_support::GetAnyChromePath.

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/installer/gcapi/gcapi.cc

Issue 685103004: Refactor chrome_launcher_support::GetAnyChromePath. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Respond to comments. Created 5 years, 11 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:

Index: chrome/installer/gcapi/gcapi.cc

diff --git a/chrome/installer/gcapi/gcapi.cc b/chrome/installer/gcapi/gcapi.cc

index ef3c9636ba667478329489a8be40832bc965f139..43b76c7170e0a3f74e4b147270cf884bb7e3c502 100644

--- a/chrome/installer/gcapi/gcapi.cc

+++ b/chrome/installer/gcapi/gcapi.cc

@@ -391,11 +391,11 @@ bool GetGoogleChromePath(base::FilePath* chrome_exe_path) {

// Now grab the uninstall string from the appropriate ClientState key

// and use that as the base for a path to chrome.exe.

- *chrome_exe_path =

- chrome_launcher_support::GetChromePathForInstallationLevel(

- install_key == HKEY_LOCAL_MACHINE ?

- chrome_launcher_support::SYSTEM_LEVEL_INSTALLATION :

- chrome_launcher_support::USER_LEVEL_INSTALLATION);

+ *chrome_exe_path = chrome_launcher_support::GetChromePathForInstallationLevel(

+ install_key == HKEY_LOCAL_MACHINE

+ ? chrome_launcher_support::SYSTEM_LEVEL_INSTALLATION

+ : chrome_launcher_support::USER_LEVEL_INSTALLATION,

+ false /* is_sxs */);

return !chrome_exe_path->empty();

}