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

Side by Side Diff: chrome/installer/util/chrome_frame_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 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/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 #include "chrome/installer/util/updating_app_registration_data.h" 20 #include "chrome/installer/util/updating_app_registration_data.h"
21 21
22 #include "installer_util_strings.h" // NOLINT 22 #include "installer_util_strings.h" // NOLINT
23 23
24 namespace { 24 namespace {
25 const wchar_t kChromeFrameGuid[] = L"{8BA986DA-5100-405E-AA35-86F34A02ACBF}"; 25 const wchar_t kChromeFrameGuid[] = L"{8BA986DA-5100-405E-AA35-86F34A02ACBF}";
26 } 26 }
27 27
28 ChromeFrameDistribution::ChromeFrameDistribution() 28 ChromeFrameDistribution::ChromeFrameDistribution()
29 : BrowserDistribution(CHROME_FRAME, 29 : BrowserDistribution(CHROME_FRAME,
30 make_scoped_ptr(new UpdatingAppRegistrationData(kChromeFrameGuid))) { 30 make_scoped_ptr(new UpdatingAppRegistrationData(
31 kChromeFrameGuid)).Pass()) {
31 } 32 }
32 33
33 base::string16 ChromeFrameDistribution::GetBaseAppName() { 34 base::string16 ChromeFrameDistribution::GetBaseAppName() {
34 return L"Google Chrome Frame"; 35 return L"Google Chrome Frame";
35 } 36 }
36 37
37 base::string16 ChromeFrameDistribution::GetBrowserProgIdPrefix() { 38 base::string16 ChromeFrameDistribution::GetBrowserProgIdPrefix() {
38 NOTREACHED(); 39 NOTREACHED();
39 return base::string16(); 40 return base::string16();
40 } 41 }
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 124
124 void ChromeFrameDistribution::UpdateInstallStatus(bool system_install, 125 void ChromeFrameDistribution::UpdateInstallStatus(bool system_install,
125 installer::ArchiveType archive_type, 126 installer::ArchiveType archive_type,
126 installer::InstallStatus install_status) { 127 installer::InstallStatus install_status) {
127 #if defined(GOOGLE_CHROME_BUILD) 128 #if defined(GOOGLE_CHROME_BUILD)
128 GoogleUpdateSettings::UpdateInstallStatus(system_install, 129 GoogleUpdateSettings::UpdateInstallStatus(system_install,
129 archive_type, InstallUtil::GetInstallReturnCode(install_status), 130 archive_type, InstallUtil::GetInstallReturnCode(install_status),
130 kChromeFrameGuid); 131 kChromeFrameGuid);
131 #endif 132 #endif
132 } 133 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698