diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-23 22:53:09 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-23 22:53:09 +0000 |
| commit | 29e90295e13f0026fa58b0b842adea8164fcc287 (patch) | |
| tree | aea45881b446113531b60517fe13e03d4e565408 | |
| parent | d76185181129c46d08da6eb2a72f075e0590f18a (diff) | |
| download | chromium_src-29e90295e13f0026fa58b0b842adea8164fcc287.zip chromium_src-29e90295e13f0026fa58b0b842adea8164fcc287.tar.gz chromium_src-29e90295e13f0026fa58b0b842adea8164fcc287.tar.bz2 | |
TBR: revert r53542. It was committed with the wrong commit message.
TBR=asargent
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53544 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, 1 insertions, 11 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 8f259ee..93586b5 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -658,9 +658,6 @@ 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 8059630..ce8a7bc 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -195,7 +195,6 @@ 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 36f6f1d..d7ffe99 100644 --- a/chrome/installer/util/google_update_settings.cc +++ b/chrome/installer/util/google_update_settings.cc @@ -1,14 +1,12 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2009 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" @@ -242,10 +240,6 @@ 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", |