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

Side by Side Diff: trunk/src/chrome/installer/util/chrome_app_host_distribution.cc

Issue 422593002: Revert 285661 "Remove some dead app host code." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 a specific implementation of BrowserDistribution class for 5 // This file defines a specific implementation of BrowserDistribution class for
6 // Chrome App Host. It overrides the bare minimum of methods necessary to get a 6 // Chrome App Host. It overrides the bare minimum of methods necessary to get a
7 // Chrome App Host installer that does not interact with Google Chrome or 7 // Chrome App Host installer that does not interact with Google Chrome or
8 // Chromium installations. 8 // Chromium installations.
9 9
10 #include "chrome/installer/util/chrome_app_host_distribution.h" 10 #include "chrome/installer/util/chrome_app_host_distribution.h"
11 11
12 #include "base/strings/string_util.h" 12 #include "base/strings/string_util.h"
13 #include "chrome/common/net/test_server_locations.h" 13 #include "chrome/common/net/test_server_locations.h"
14 #include "chrome/installer/util/channel_info.h" 14 #include "chrome/installer/util/channel_info.h"
15 #include "chrome/installer/util/google_update_constants.h" 15 #include "chrome/installer/util/google_update_constants.h"
16 #include "chrome/installer/util/google_update_settings.h" 16 #include "chrome/installer/util/google_update_settings.h"
17 #include "chrome/installer/util/helper.h" 17 #include "chrome/installer/util/helper.h"
18 #include "chrome/installer/util/install_util.h" 18 #include "chrome/installer/util/install_util.h"
19 #include "chrome/installer/util/l10n_string_util.h" 19 #include "chrome/installer/util/l10n_string_util.h"
20 #include "chrome/installer/util/updating_app_registration_data.h" 20 #include "chrome/installer/util/updating_app_registration_data.h"
21 21
22 #include "installer_util_strings.h" // NOLINT 22 #include "installer_util_strings.h" // NOLINT
23 23
24 namespace {
25
26 const wchar_t kChromeAppHostGuid[] = L"{FDA71E6F-AC4C-4a00-8B70-9958A68906BF}";
27
28 } // namespace
29
24 ChromeAppHostDistribution::ChromeAppHostDistribution() 30 ChromeAppHostDistribution::ChromeAppHostDistribution()
25 : BrowserDistribution( 31 : BrowserDistribution(
26 CHROME_APP_HOST, 32 CHROME_APP_HOST,
27 scoped_ptr<AppRegistrationData>( 33 scoped_ptr<AppRegistrationData>(
28 new UpdatingAppRegistrationData(installer::kAppLauncherGuid))) { 34 new UpdatingAppRegistrationData(kChromeAppHostGuid))) {
29 } 35 }
30 36
31 base::string16 ChromeAppHostDistribution::GetBaseAppName() { 37 base::string16 ChromeAppHostDistribution::GetBaseAppName() {
32 return L"Google Chrome App Launcher"; 38 return L"Google Chrome App Launcher";
33 } 39 }
34 40
35 base::string16 ChromeAppHostDistribution::GetBrowserProgIdPrefix() { 41 base::string16 ChromeAppHostDistribution::GetBrowserProgIdPrefix() {
36 NOTREACHED(); 42 NOTREACHED();
37 return base::string16(); 43 return base::string16();
38 } 44 }
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 125
120 void ChromeAppHostDistribution::UpdateInstallStatus(bool system_install, 126 void ChromeAppHostDistribution::UpdateInstallStatus(bool system_install,
121 installer::ArchiveType archive_type, 127 installer::ArchiveType archive_type,
122 installer::InstallStatus install_status) { 128 installer::InstallStatus install_status) {
123 #if defined(GOOGLE_CHROME_BUILD) 129 #if defined(GOOGLE_CHROME_BUILD)
124 GoogleUpdateSettings::UpdateInstallStatus(system_install, 130 GoogleUpdateSettings::UpdateInstallStatus(system_install,
125 archive_type, InstallUtil::GetInstallReturnCode(install_status), 131 archive_type, InstallUtil::GetInstallReturnCode(install_status),
126 kChromeAppHostGuid); 132 kChromeAppHostGuid);
127 #endif 133 #endif
128 } 134 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/installer/setup/uninstall.cc ('k') | trunk/src/chrome/installer/util/google_update_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698