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

Side by Side Diff: chrome/installer/util/chrome_frame_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 Frame. It overrides the bare minimum of methods necessary to get a 6 // Chrome Frame. It overrides the bare minimum of methods necessary to get a
7 // Chrome Frame installer that does not interact with Google Chrome or 7 // Chrome Frame installer that does not interact with Google Chrome or
8 // Chromium installations. 8 // Chromium installations.
9 9
10 #include "chrome/installer/util/chrome_frame_distribution.h" 10 #include "chrome/installer/util/chrome_frame_distribution.h"
(...skipping 30 matching lines...) Expand all
41 installer::GetLocalizedString(IDS_PRODUCT_FRAME_NAME_BASE); 41 installer::GetLocalizedString(IDS_PRODUCT_FRAME_NAME_BASE);
42 return product_name; 42 return product_name;
43 } 43 }
44 44
45 string16 ChromeFrameDistribution::GetAlternateApplicationName() { 45 string16 ChromeFrameDistribution::GetAlternateApplicationName() {
46 const string16& product_name = 46 const string16& product_name =
47 installer::GetLocalizedString(IDS_PRODUCT_FRAME_NAME_BASE); 47 installer::GetLocalizedString(IDS_PRODUCT_FRAME_NAME_BASE);
48 return product_name; 48 return product_name;
49 } 49 }
50 50
51 string16 ChromeFrameDistribution::GetAppListShortcutName() {
52 NOTREACHED();
53 return string16();
54 }
55
56 string16 ChromeFrameDistribution::GetAppShortcutsSubdirName() {
57 NOTREACHED();
58 return string16();
59 }
60
51 string16 ChromeFrameDistribution::GetInstallSubDir() { 61 string16 ChromeFrameDistribution::GetInstallSubDir() {
52 return L"Google\\Chrome Frame"; 62 return L"Google\\Chrome Frame";
53 } 63 }
54 64
55 string16 ChromeFrameDistribution::GetPublisherName() { 65 string16 ChromeFrameDistribution::GetPublisherName() {
56 const string16& publisher_name = 66 const string16& publisher_name =
57 installer::GetLocalizedString(IDS_ABOUT_VERSION_COMPANY_NAME_BASE); 67 installer::GetLocalizedString(IDS_ABOUT_VERSION_COMPANY_NAME_BASE);
58 return publisher_name; 68 return publisher_name;
59 } 69 }
60 70
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 141
132 void ChromeFrameDistribution::UpdateInstallStatus(bool system_install, 142 void ChromeFrameDistribution::UpdateInstallStatus(bool system_install,
133 installer::ArchiveType archive_type, 143 installer::ArchiveType archive_type,
134 installer::InstallStatus install_status) { 144 installer::InstallStatus install_status) {
135 #if defined(GOOGLE_CHROME_BUILD) 145 #if defined(GOOGLE_CHROME_BUILD)
136 GoogleUpdateSettings::UpdateInstallStatus(system_install, 146 GoogleUpdateSettings::UpdateInstallStatus(system_install,
137 archive_type, InstallUtil::GetInstallReturnCode(install_status), 147 archive_type, InstallUtil::GetInstallReturnCode(install_status),
138 kChromeFrameGuid); 148 kChromeFrameGuid);
139 #endif 149 #endif
140 } 150 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698