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

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

Issue 11359133: Add default icon to app_host.exe, and use it in shortcuts during installation. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Renaming GetChromiumIconString() => GetChromiumIconLocation(). Created 8 years, 1 month 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
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/string_util.h" 12 #include "base/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 20
21 #include "installer_util_strings.h" // NOLINT 21 #include "installer_util_strings.h" // NOLINT
22 22
23 namespace { 23 namespace {
24 24
25 #if defined(GOOGLE_CHROME_BUILD)
26 const int kAppListIconIndex = 5;
27 #else
28 const int kAppListIconIndex = 1;
29 #endif
30 const wchar_t kChromeAppHostGuid[] = L"{FDA71E6F-AC4C-4a00-8B70-9958A68906BF}"; 25 const wchar_t kChromeAppHostGuid[] = L"{FDA71E6F-AC4C-4a00-8B70-9958A68906BF}";
31 26
32 } // namespace 27 } // namespace
33 28
34 ChromeAppHostDistribution::ChromeAppHostDistribution() 29 ChromeAppHostDistribution::ChromeAppHostDistribution()
35 : BrowserDistribution(CHROME_APP_HOST) { 30 : BrowserDistribution(CHROME_APP_HOST) {
36 } 31 }
37 32
38 string16 ChromeAppHostDistribution::GetAppGuid() { 33 string16 ChromeAppHostDistribution::GetAppGuid() {
39 return kChromeAppHostGuid; 34 return kChromeAppHostGuid;
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 } 127 }
133 128
134 bool ChromeAppHostDistribution::CanSetAsDefault() { 129 bool ChromeAppHostDistribution::CanSetAsDefault() {
135 return false; 130 return false;
136 } 131 }
137 132
138 bool ChromeAppHostDistribution::CanCreateDesktopShortcuts() { 133 bool ChromeAppHostDistribution::CanCreateDesktopShortcuts() {
139 return true; 134 return true;
140 } 135 }
141 136
142 int ChromeAppHostDistribution::GetIconIndex() { 137 string16 ChromeAppHostDistribution::GetIconFilename() {
143 return kAppListIconIndex; 138 return installer::kChromeAppHostExe;
144 } 139 }
145 140
146 bool ChromeAppHostDistribution::GetCommandExecuteImplClsid( 141 bool ChromeAppHostDistribution::GetCommandExecuteImplClsid(
147 string16* handler_class_uuid) { 142 string16* handler_class_uuid) {
148 return false; 143 return false;
149 } 144 }
150 145
151 void ChromeAppHostDistribution::UpdateInstallStatus(bool system_install, 146 void ChromeAppHostDistribution::UpdateInstallStatus(bool system_install,
152 installer::ArchiveType archive_type, 147 installer::ArchiveType archive_type,
153 installer::InstallStatus install_status) { 148 installer::InstallStatus install_status) {
154 #if defined(GOOGLE_CHROME_BUILD) 149 #if defined(GOOGLE_CHROME_BUILD)
155 GoogleUpdateSettings::UpdateInstallStatus(system_install, 150 GoogleUpdateSettings::UpdateInstallStatus(system_install,
156 archive_type, InstallUtil::GetInstallReturnCode(install_status), 151 archive_type, InstallUtil::GetInstallReturnCode(install_status),
157 kChromeAppHostGuid); 152 kChromeAppHostGuid);
158 #endif 153 #endif
159 } 154 }
OLDNEW
« no previous file with comments | « chrome/installer/util/chrome_app_host_distribution.h ('k') | chrome/installer/util/chrome_app_host_operations.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698