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

Side by Side Diff: chrome/installer/util/google_chrome_distribution.cc

Issue 2339001: Separate version env variable for different distributions. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/installer/util/google_chrome_distribution.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 // This file defines specific implementation of BrowserDistribution class for 5 // This file defines specific implementation of BrowserDistribution class for
6 // Google Chrome. 6 // Google Chrome.
7 7
8 #include "chrome/installer/util/google_chrome_distribution.h" 8 #include "chrome/installer/util/google_chrome_distribution.h"
9 9
10 #include <windows.h> 10 #include <windows.h>
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 L"Google Chrome"; 472 L"Google Chrome";
473 } 473 }
474 474
475 std::wstring GoogleChromeDistribution::GetVersionKey() { 475 std::wstring GoogleChromeDistribution::GetVersionKey() {
476 std::wstring key(google_update::kRegPathClients); 476 std::wstring key(google_update::kRegPathClients);
477 key.append(L"\\"); 477 key.append(L"\\");
478 key.append(product_guid()); 478 key.append(product_guid());
479 return key; 479 return key;
480 } 480 }
481 481
482 std::wstring GoogleChromeDistribution::GetEnvVersionKey() {
483 return L"CHROME_VERSION";
484 }
485
482 // This method checks if we need to change "ap" key in Google Update to try 486 // This method checks if we need to change "ap" key in Google Update to try
483 // full installer as fall back method in case incremental installer fails. 487 // full installer as fall back method in case incremental installer fails.
484 // - If incremental installer fails we append a magic string ("-full"), if 488 // - If incremental installer fails we append a magic string ("-full"), if
485 // it is not present already, so that Google Update server next time will send 489 // it is not present already, so that Google Update server next time will send
486 // full installer to update Chrome on the local machine 490 // full installer to update Chrome on the local machine
487 // - If we are currently running full installer, we remove this magic 491 // - If we are currently running full installer, we remove this magic
488 // string (if it is present) regardless of whether installer failed or not. 492 // string (if it is present) regardless of whether installer failed or not.
489 // There is no fall-back for full installer :) 493 // There is no fall-back for full installer :)
490 void GoogleChromeDistribution::UpdateDiffInstallStatus(bool system_install, 494 void GoogleChromeDistribution::UpdateDiffInstallStatus(bool system_install,
491 bool incremental_install, installer_util::InstallStatus install_status) { 495 bool incremental_install, installer_util::InstallStatus install_status) {
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 GoogleUpdateSettings::SetClient(GetExperimentGroup(outcome, flavor)); 637 GoogleUpdateSettings::SetClient(GetExperimentGroup(outcome, flavor));
634 if (outcome != kToastExpUninstallGroup) 638 if (outcome != kToastExpUninstallGroup)
635 return; 639 return;
636 // The user wants to uninstall. This is a best effort operation. Note that 640 // The user wants to uninstall. This is a best effort operation. Note that
637 // we waited for chrome to exit so the uninstall would not detect chrome 641 // we waited for chrome to exit so the uninstall would not detect chrome
638 // running. 642 // running.
639 base::LaunchApp(InstallUtil::GetChromeUninstallCmd(system_install), 643 base::LaunchApp(InstallUtil::GetChromeUninstallCmd(system_install),
640 false, false, NULL); 644 false, false, NULL);
641 } 645 }
642 #endif 646 #endif
OLDNEW
« no previous file with comments | « chrome/installer/util/google_chrome_distribution.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698