chrome/browser/browser_main.cc - Issue 7065024: Add a self-destruct mechanism to user-level Chrome Frame when it detects that system-level Chrome...

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/browser_main.cc

Issue 7065024: Add a self-destruct mechanism to user-level Chrome Frame when it detects that system-level Chrome... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 7 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

Index: chrome/browser/browser_main.cc

===================================================================

--- chrome/browser/browser_main.cc (revision 86605)

+++ chrome/browser/browser_main.cc (working copy)

@@ -1609,7 +1609,9 @@

// Note this check should only happen here, after all the checks above

// (uninstall, resource bundle initialization, other chrome browser

// processes etc).

- if (CheckMachineLevelInstall())

+ // Do not allow this to occur for Chrome Frame user-to-system handoffs.

+ if (!parsed_command_line.HasSwitch(switches::kChromeFrame) &&

+ CheckMachineLevelInstall())

return ResultCodes::MACHINE_LEVEL_INSTALL_EXISTS;

// Create the TranslateManager singleton.

« no previous file with comments | « no previous file | chrome/installer/util/browser_distribution.cc » ('j') | no next file with comments »