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

Unified Diff: chrome/browser/first_run/upgrade_util_win.cc

Issue 129003003: Remove support for specifying version on command line. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync to r244153 Created 6 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
« no previous file with comments | « chrome/app/client_util.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/first_run/upgrade_util_win.cc
diff --git a/chrome/browser/first_run/upgrade_util_win.cc b/chrome/browser/first_run/upgrade_util_win.cc
index 47d74653518ee033bce5d7cab2b5e798028d7a7d..b1293360a38a62ec16427c4277891f7d72b1fc29 100644
--- a/chrome/browser/first_run/upgrade_util_win.cc
+++ b/chrome/browser/first_run/upgrade_util_win.cc
@@ -225,29 +225,6 @@ bool SwapNewChromeExeIfPresent() {
base::win::RegKey key;
if (key.Open(reg_root, dist->GetVersionKey().c_str(),
KEY_QUERY_VALUE) == ERROR_SUCCESS) {
-
- // Having just ascertained that we can swap, now check that we should: if
- // we are given an explicit --chrome-version flag, don't rename unless the
- // specified version matches the "pv" value. In practice, this is used to
- // defer Chrome Frame updates until the current version of the Chrome Frame
- // DLL component is loaded.
- const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
- if (cmd_line.HasSwitch(switches::kChromeVersion)) {
- std::string version_string =
- cmd_line.GetSwitchValueASCII(switches::kChromeVersion);
- Version cmd_version(version_string);
-
- std::wstring pv_value;
- if (key.ReadValue(google_update::kRegVersionField,
- &pv_value) == ERROR_SUCCESS) {
- Version pv_version(WideToASCII(pv_value));
- if (cmd_version.IsValid() && pv_version.IsValid() &&
- !cmd_version.Equals(pv_version)) {
- return false;
- }
- }
- }
-
// First try to rename exe by launching rename command ourselves.
std::wstring rename_cmd;
if (key.ReadValue(google_update::kRegRenameCmdField,
« no previous file with comments | « chrome/app/client_util.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698