chrome/installer/util/chrome_browser_operations.cc - Issue 811283002: [Installer] Cleaning up dead code for App Launcher / App Host installs.

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/util/chrome_browser_operations.cc

Issue 811283002: [Installer] Cleaning up dead code for App Launcher / App Host installs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove query-eula-acceptance; changing ChannelInfo cleanup approach. 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:

View side-by-side diff with in-line comments

Download patch

« chrome/installer/util/channel_info.h ('K') | « chrome/installer/util/chrome_app_host_operations.cc ('k') | chrome/installer/util/eula_util.cc » ('j') | chrome/installer/util/util_constants.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/installer/util/chrome_browser_operations.cc

diff --git a/chrome/installer/util/chrome_browser_operations.cc b/chrome/installer/util/chrome_browser_operations.cc

index 1b7bd00a87f61ad64c28c503718c99ea4b751c90..935555faed4f09f56f0c29095bef6511048b5b59 100644

--- a/chrome/installer/util/chrome_browser_operations.cc

+++ b/chrome/installer/util/chrome_browser_operations.cc

@@ -88,7 +88,11 @@ bool ChromeBrowserOperations::SetChannelFlags(

ChannelInfo* channel_info) const {

#if defined(GOOGLE_CHROME_BUILD)

DCHECK(channel_info);

- return channel_info->SetChrome(set);

+ bool chrome_changed = channel_info->SetChrome(set);

+ // Remove App Launcher's channel flags, since App Launcher does not exist as

+ // an independent product, and is a part of Chrome.

+ bool app_launcher_changed = channel_info->SetAppLauncher(false);

+ return chrome_changed || app_launcher_changed;

#else

return false;

#endif