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

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

Issue 1878313003: Convert //chrome/installer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert decompress.cc in mini_installer. Created 4 years, 8 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"
11 11
12 #include "base/strings/string_util.h" 12 #include "base/strings/string_util.h"
13 #include "chrome/installer/util/channel_info.h" 13 #include "chrome/installer/util/channel_info.h"
14 #include "chrome/installer/util/google_update_constants.h" 14 #include "chrome/installer/util/google_update_constants.h"
15 #include "chrome/installer/util/google_update_settings.h" 15 #include "chrome/installer/util/google_update_settings.h"
16 #include "chrome/installer/util/helper.h" 16 #include "chrome/installer/util/helper.h"
17 #include "chrome/installer/util/install_util.h" 17 #include "chrome/installer/util/install_util.h"
18 #include "chrome/installer/util/installer_util_strings.h" 18 #include "chrome/installer/util/installer_util_strings.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 namespace { 22 namespace {
23 const wchar_t kChromeFrameGuid[] = L"{8BA986DA-5100-405E-AA35-86F34A02ACBF}"; 23 const wchar_t kChromeFrameGuid[] = L"{8BA986DA-5100-405E-AA35-86F34A02ACBF}";
24 } 24 }
25 25
26 ChromeFrameDistribution::ChromeFrameDistribution() 26 ChromeFrameDistribution::ChromeFrameDistribution()
27 : BrowserDistribution( 27 : BrowserDistribution(
28 CHROME_FRAME, 28 CHROME_FRAME,
29 scoped_ptr<AppRegistrationData>( 29 std::unique_ptr<AppRegistrationData>(
30 new UpdatingAppRegistrationData(kChromeFrameGuid))) { 30 new UpdatingAppRegistrationData(kChromeFrameGuid))) {}
31 }
32 31
33 base::string16 ChromeFrameDistribution::GetBaseAppName() { 32 base::string16 ChromeFrameDistribution::GetBaseAppName() {
34 return L"Google Chrome Frame"; 33 return L"Google Chrome Frame";
35 } 34 }
36 35
37 base::string16 ChromeFrameDistribution::GetBrowserProgIdPrefix() { 36 base::string16 ChromeFrameDistribution::GetBrowserProgIdPrefix() {
38 NOTREACHED(); 37 NOTREACHED();
39 return base::string16(); 38 return base::string16();
40 } 39 }
41 40
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 113
115 void ChromeFrameDistribution::UpdateInstallStatus(bool system_install, 114 void ChromeFrameDistribution::UpdateInstallStatus(bool system_install,
116 installer::ArchiveType archive_type, 115 installer::ArchiveType archive_type,
117 installer::InstallStatus install_status) { 116 installer::InstallStatus install_status) {
118 #if defined(GOOGLE_CHROME_BUILD) 117 #if defined(GOOGLE_CHROME_BUILD)
119 GoogleUpdateSettings::UpdateInstallStatus(system_install, 118 GoogleUpdateSettings::UpdateInstallStatus(system_install,
120 archive_type, InstallUtil::GetInstallReturnCode(install_status), 119 archive_type, InstallUtil::GetInstallReturnCode(install_status),
121 kChromeFrameGuid); 120 kChromeFrameGuid);
122 #endif 121 #endif
123 } 122 }
OLDNEW
« no previous file with comments | « chrome/installer/util/browser_distribution.cc ('k') | chrome/installer/util/chromium_binaries_distribution.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698