Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(441)

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
« no previous file with comments | « no previous file | chrome/installer/util/browser_distribution.cc » ('j') | chrome_frame/bho_loader.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_main.cc
===================================================================
--- chrome/browser/browser_main.cc (revision 85906)
+++ chrome/browser/browser_main.cc (working copy)
@@ -1603,7 +1603,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') | chrome_frame/bho_loader.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698