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

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

Issue 13864015: Move app launcher and chrome apps shortcut strings into the installer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@migrate_app_id_fix
Patch Set: rebase, move app launcher and chrome app strings into the installer Created 7 years, 7 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
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"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 installer::GetLocalizedString(IDS_PRODUCT_APP_LAUNCHER_NAME_BASE); 43 installer::GetLocalizedString(IDS_PRODUCT_APP_LAUNCHER_NAME_BASE);
44 return product_name; 44 return product_name;
45 } 45 }
46 46
47 string16 ChromeAppHostDistribution::GetAlternateApplicationName() { 47 string16 ChromeAppHostDistribution::GetAlternateApplicationName() {
48 const string16& product_name = 48 const string16& product_name =
49 installer::GetLocalizedString(IDS_PRODUCT_APP_LAUNCHER_NAME_BASE); 49 installer::GetLocalizedString(IDS_PRODUCT_APP_LAUNCHER_NAME_BASE);
50 return product_name; 50 return product_name;
51 } 51 }
52 52
53 string16 ChromeAppHostDistribution::GetAppListShortcutName() {
54 return installer::GetLocalizedString(IDS_APP_LIST_SHORTCUT_NAME_BASE);
55 }
56
57 string16 ChromeAppHostDistribution::GetAppShortcutsSubdirName() {
58 return installer::GetLocalizedString(IDS_APP_SHORTCUTS_SUBDIR_NAME_BASE);
59 }
60
53 string16 ChromeAppHostDistribution::GetBaseAppId() { 61 string16 ChromeAppHostDistribution::GetBaseAppId() {
54 // Should be same as AppListController::GetAppModelId(). 62 // Should be same as AppListController::GetAppModelId().
55 return L"ChromeAppList"; 63 return L"ChromeAppList";
56 } 64 }
57 65
58 string16 ChromeAppHostDistribution::GetInstallSubDir() { 66 string16 ChromeAppHostDistribution::GetInstallSubDir() {
59 return BrowserDistribution::GetSpecificDistribution( 67 return BrowserDistribution::GetSpecificDistribution(
60 BrowserDistribution::CHROME_BINARIES)->GetInstallSubDir(); 68 BrowserDistribution::CHROME_BINARIES)->GetInstallSubDir();
61 } 69 }
62 70
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 149
142 void ChromeAppHostDistribution::UpdateInstallStatus(bool system_install, 150 void ChromeAppHostDistribution::UpdateInstallStatus(bool system_install,
143 installer::ArchiveType archive_type, 151 installer::ArchiveType archive_type,
144 installer::InstallStatus install_status) { 152 installer::InstallStatus install_status) {
145 #if defined(GOOGLE_CHROME_BUILD) 153 #if defined(GOOGLE_CHROME_BUILD)
146 GoogleUpdateSettings::UpdateInstallStatus(system_install, 154 GoogleUpdateSettings::UpdateInstallStatus(system_install,
147 archive_type, InstallUtil::GetInstallReturnCode(install_status), 155 archive_type, InstallUtil::GetInstallReturnCode(install_status),
148 kChromeAppHostGuid); 156 kChromeAppHostGuid);
149 #endif 157 #endif
150 } 158 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698