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

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

Issue 367403002: Add missing Pass() calls for passing scoped_ptrs on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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
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 class that contains various method related to branding. 5 // This file defines a class that contains various method related to branding.
6 6
7 #include "chrome/installer/util/google_chrome_binaries_distribution.h" 7 #include "chrome/installer/util/google_chrome_binaries_distribution.h"
8 8
9 #include "chrome/installer/util/google_update_constants.h" 9 #include "chrome/installer/util/google_update_constants.h"
10 #include "chrome/installer/util/google_update_settings.h" 10 #include "chrome/installer/util/google_update_settings.h"
11 #include "chrome/installer/util/install_util.h" 11 #include "chrome/installer/util/install_util.h"
12 #include "chrome/installer/util/updating_app_registration_data.h" 12 #include "chrome/installer/util/updating_app_registration_data.h"
13 13
14 namespace { 14 namespace {
15 15
16 const wchar_t kChromeBinariesGuid[] = L"{4DC8B4CA-1BDA-483e-B5FA-D3C12E15B62D}"; 16 const wchar_t kChromeBinariesGuid[] = L"{4DC8B4CA-1BDA-483e-B5FA-D3C12E15B62D}";
17 const wchar_t kChromeBinariesName[] = L"Google Chrome binaries"; 17 const wchar_t kChromeBinariesName[] = L"Google Chrome binaries";
18 18
19 } // namespace 19 } // namespace
20 20
21 GoogleChromeBinariesDistribution::GoogleChromeBinariesDistribution() 21 GoogleChromeBinariesDistribution::GoogleChromeBinariesDistribution()
22 : ChromiumBinariesDistribution( 22 : ChromiumBinariesDistribution(
23 make_scoped_ptr( 23 make_scoped_ptr(new UpdatingAppRegistrationData(kChromeBinariesGuid))
24 new UpdatingAppRegistrationData(kChromeBinariesGuid))) { 24 .Pass()) {
25 } 25 }
26 26
27 base::string16 GoogleChromeBinariesDistribution::GetDisplayName() { 27 base::string16 GoogleChromeBinariesDistribution::GetDisplayName() {
28 return kChromeBinariesName; 28 return kChromeBinariesName;
29 } 29 }
30 30
31 base::string16 GoogleChromeBinariesDistribution::GetShortcutName( 31 base::string16 GoogleChromeBinariesDistribution::GetShortcutName(
32 ShortcutType shortcut_type) { 32 ShortcutType shortcut_type) {
33 NOTREACHED(); 33 NOTREACHED();
34 return base::string16(); 34 return base::string16();
35 } 35 }
36 36
37 void GoogleChromeBinariesDistribution::UpdateInstallStatus(bool system_install, 37 void GoogleChromeBinariesDistribution::UpdateInstallStatus(bool system_install,
38 installer::ArchiveType archive_type, 38 installer::ArchiveType archive_type,
39 installer::InstallStatus install_status) { 39 installer::InstallStatus install_status) {
40 GoogleUpdateSettings::UpdateInstallStatus(system_install, 40 GoogleUpdateSettings::UpdateInstallStatus(system_install,
41 archive_type, InstallUtil::GetInstallReturnCode(install_status), 41 archive_type, InstallUtil::GetInstallReturnCode(install_status),
42 kChromeBinariesGuid); 42 kChromeBinariesGuid);
43 } 43 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698