diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-23 23:04:16 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-23 23:04:16 +0000 |
| commit | e55378cd7576dd71f40a6922de3a8182ee45bdeb (patch) | |
| tree | 0a6e595de4f72aa0aea6719ab1af583d9b6317f3 | |
| parent | 643392dea6e2a3d07e4451e3bcb07650fa941dad (diff) | |
| download | chromium_src-e55378cd7576dd71f40a6922de3a8182ee45bdeb.zip chromium_src-e55378cd7576dd71f40a6922de3a8182ee45bdeb.tar.gz chromium_src-e55378cd7576dd71f40a6922de3a8182ee45bdeb.tar.bz2 | |
Windows: Add --organic flag to simulate an organic install for testing purposes.
BUG=none
TEST=run with --organic --first-run
Review URL: http://codereview.chromium.org/3047011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53546 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/common/chrome_switches.cc | 3 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 1 | ||||
| -rw-r--r-- | chrome/installer/util/google_update_settings.cc | 8 |
3 files changed, 11 insertions, 1 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 93586b5..8f259ee 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -658,6 +658,9 @@ const char kNumPacThreads[] = "num-pac-threads"; // Launch URL in new browser window. const char kOpenInNewWindow[] = "new-window"; +// Simulate an organic Chrome install. +const char kOrganicInstall[] = "organic"; + // Package an extension to a .crx installable file from a given directory. const char kPackExtension[] = "pack-extension"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index ce8a7bc..8059630 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -195,6 +195,7 @@ extern const char kNoReferrers[]; extern const char kNoSandbox[]; extern const char kNumPacThreads[]; extern const char kOpenInNewWindow[]; +extern const char kOrganicInstall[]; extern const char kPackExtension[]; extern const char kPackExtensionKey[]; extern const char kParentProfile[]; diff --git a/chrome/installer/util/google_update_settings.cc b/chrome/installer/util/google_update_settings.cc index d7ffe99..36f6f1d 100644 --- a/chrome/installer/util/google_update_settings.cc +++ b/chrome/installer/util/google_update_settings.cc @@ -1,12 +1,14 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/installer/util/google_update_settings.h" +#include "base/command_line.h" #include "base/registry.h" #include "base/string_util.h" #include "base/time.h" +#include "chrome/common/chrome_switches.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/google_update_constants.h" #include "chrome/installer/util/install_util.h" @@ -240,6 +242,10 @@ std::wstring GoogleUpdateSettings::GetNewGoogleUpdateApKey( } bool GoogleUpdateSettings::IsOrganic(const std::wstring& brand) { + const CommandLine& command_line = *CommandLine::ForCurrentProcess(); + if (command_line.HasSwitch(switches::kOrganicInstall)) + return true; + static const wchar_t* kBrands[] = { L"CHFO", L"CHFT", L"CHHS", L"CHHM", L"CHMA", L"CHMB", L"CHME", L"CHMF", L"CHMG", L"CHMH", L"CHMI", L"CHMQ", L"CHMV", L"CHNB", L"CHNC", L"CHNG", |