diff options
author | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 17:08:54 +0000 |
---|---|---|
committer | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 17:08:54 +0000 |
commit | a1cbc96e8f0bbdbefa209367c5633c7ad0f3e111 (patch) | |
tree | 2ab182fc502bde4990f42e9a913c434007d52c67 /chrome/installer/util/chrome_app_host_operations.cc | |
parent | 912f06843fb90f6b50a9b6e270253d67f9be1d88 (diff) | |
download | chromium_src-a1cbc96e8f0bbdbefa209367c5633c7ad0f3e111.zip chromium_src-a1cbc96e8f0bbdbefa209367c5633c7ad0f3e111.tar.gz chromium_src-a1cbc96e8f0bbdbefa209367c5633c7ad0f3e111.tar.bz2 |
Revert 147650 - Implement installation of the Chrome App Host.
The Chrome App Host is a simple exe that delegates to a Chrome Binaries installation at user or system level. If no installation is available, it will trigger an installation.
The Chrome App Host prevents the Chrome Binaries from being uninstalled, except in the case of an upgrade to system-level.
The Chrome App Host is implemented in this uncommitted CL: http://codereview.chromium.org/10559090/ .
BUG=None
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10665002
TBR=erikwright@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10797047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147668 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/chrome_app_host_operations.cc')
-rw-r--r-- | chrome/installer/util/chrome_app_host_operations.cc | 100 |
1 files changed, 0 insertions, 100 deletions
diff --git a/chrome/installer/util/chrome_app_host_operations.cc b/chrome/installer/util/chrome_app_host_operations.cc deleted file mode 100644 index 07427f5..0000000 --- a/chrome/installer/util/chrome_app_host_operations.cc +++ /dev/null @@ -1,100 +0,0 @@ -// Copyright (c) 2012 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/chrome_app_host_operations.h" - -#include "base/command_line.h" -#include "base/file_path.h" -#include "base/logging.h" -#include "chrome/installer/util/browser_distribution.h" -#include "chrome/installer/util/channel_info.h" -#include "chrome/installer/util/helper.h" -#include "chrome/installer/util/master_preferences.h" -#include "chrome/installer/util/master_preferences_constants.h" -#include "chrome/installer/util/util_constants.h" - -namespace installer { - -void ChromeAppHostOperations::ReadOptions( - const MasterPreferences& prefs, - std::set<std::wstring>* options) const { - DCHECK(options); - - bool pref_value; - if (prefs.GetBool(master_preferences::kMultiInstall, &pref_value) && - pref_value) { - options->insert(kOptionMultiInstall); - } -} - -void ChromeAppHostOperations::ReadOptions( - const CommandLine& uninstall_command, - std::set<std::wstring>* options) const { - DCHECK(options); - - if (uninstall_command.HasSwitch(switches::kMultiInstall)) - options->insert(kOptionMultiInstall); -} - -void ChromeAppHostOperations::AddKeyFiles( - const std::set<std::wstring>& options, - std::vector<FilePath>* key_files) const { -} - -void ChromeAppHostOperations::AddComDllList( - const std::set<std::wstring>& options, - std::vector<FilePath>* com_dll_list) const { -} - -void ChromeAppHostOperations::AppendProductFlags( - const std::set<std::wstring>& options, - CommandLine* cmd_line) const { - DCHECK(cmd_line); - bool is_multi_install = options.find(kOptionMultiInstall) != options.end(); - - // Non-multi-install not supported for the app host. - DCHECK(is_multi_install); - - // Add --multi-install if it isn't already there. - if (is_multi_install && !cmd_line->HasSwitch(switches::kMultiInstall)) - cmd_line->AppendSwitch(switches::kMultiInstall); - - // --app-host is always needed. - cmd_line->AppendSwitch(switches::kChromeAppHost); -} - -void ChromeAppHostOperations::AppendRenameFlags( - const std::set<std::wstring>& options, - CommandLine* cmd_line) const { - DCHECK(cmd_line); - bool is_multi_install = options.find(kOptionMultiInstall) != options.end(); - - // Non-multi-install not supported for the app host. - DCHECK(is_multi_install); - - // Add --multi-install if it isn't already there. - if (is_multi_install && !cmd_line->HasSwitch(switches::kMultiInstall)) - cmd_line->AppendSwitch(switches::kMultiInstall); -} - -bool ChromeAppHostOperations::SetChannelFlags( - const std::set<std::wstring>& options, - bool set, - ChannelInfo* channel_info) const { -#if defined(GOOGLE_CHROME_BUILD) - DCHECK(channel_info); - bool modified = channel_info->SetAppHost(set); - - return modified; -#else - return false; -#endif -} - -bool ChromeAppHostOperations::ShouldCreateUninstallEntry( - const std::set<std::wstring>& options) const { - return false; -} - -} // namespace installer |