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

Side by Side Diff: chrome/installer/util/chrome_app_host_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 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 10 matching lines...) Expand all
21 21
22 #include "installer_util_strings.h" // NOLINT 22 #include "installer_util_strings.h" // NOLINT
23 23
24 namespace { 24 namespace {
25 25
26 const wchar_t kChromeAppHostGuid[] = L"{FDA71E6F-AC4C-4a00-8B70-9958A68906BF}"; 26 const wchar_t kChromeAppHostGuid[] = L"{FDA71E6F-AC4C-4a00-8B70-9958A68906BF}";
27 27
28 } // namespace 28 } // namespace
29 29
30 ChromeAppHostDistribution::ChromeAppHostDistribution() 30 ChromeAppHostDistribution::ChromeAppHostDistribution()
31 : BrowserDistribution(CHROME_APP_HOST, 31 : BrowserDistribution(
32 make_scoped_ptr( 32 CHROME_APP_HOST,
33 scoped_ptr<AppRegistrationData>(
33 new UpdatingAppRegistrationData(kChromeAppHostGuid))) { 34 new UpdatingAppRegistrationData(kChromeAppHostGuid))) {
34 } 35 }
35 36
36 base::string16 ChromeAppHostDistribution::GetBaseAppName() { 37 base::string16 ChromeAppHostDistribution::GetBaseAppName() {
37 return L"Google Chrome App Launcher"; 38 return L"Google Chrome App Launcher";
38 } 39 }
39 40
40 base::string16 ChromeAppHostDistribution::GetBrowserProgIdPrefix() { 41 base::string16 ChromeAppHostDistribution::GetBrowserProgIdPrefix() {
41 NOTREACHED(); 42 NOTREACHED();
42 return base::string16(); 43 return base::string16();
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 125
125 void ChromeAppHostDistribution::UpdateInstallStatus(bool system_install, 126 void ChromeAppHostDistribution::UpdateInstallStatus(bool system_install,
126 installer::ArchiveType archive_type, 127 installer::ArchiveType archive_type,
127 installer::InstallStatus install_status) { 128 installer::InstallStatus install_status) {
128 #if defined(GOOGLE_CHROME_BUILD) 129 #if defined(GOOGLE_CHROME_BUILD)
129 GoogleUpdateSettings::UpdateInstallStatus(system_install, 130 GoogleUpdateSettings::UpdateInstallStatus(system_install,
130 archive_type, InstallUtil::GetInstallReturnCode(install_status), 131 archive_type, InstallUtil::GetInstallReturnCode(install_status),
131 kChromeAppHostGuid); 132 kChromeAppHostGuid);
132 #endif 133 #endif
133 } 134 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc ('k') | chrome/installer/util/chrome_frame_distribution.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698