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

Side by Side Diff: chrome/installer/util/chromium_binaries_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 declares a class that contains various method related to branding. 5 // This file declares 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 <utility> 9 #include <utility>
10 10
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "chrome/installer/util/app_registration_data.h" 12 #include "chrome/installer/util/app_registration_data.h"
13 #include "chrome/installer/util/non_updating_app_registration_data.h" 13 #include "chrome/installer/util/non_updating_app_registration_data.h"
14 14
15 namespace { 15 namespace {
16 16
17 const wchar_t kChromiumBinariesName[] = L"Chromium Binaries"; 17 const wchar_t kChromiumBinariesName[] = L"Chromium Binaries";
18 18
19 } // namespace 19 } // namespace
20 20
21 ChromiumBinariesDistribution::ChromiumBinariesDistribution() 21 ChromiumBinariesDistribution::ChromiumBinariesDistribution()
22 : BrowserDistribution( 22 : BrowserDistribution(CHROME_BINARIES,
23 CHROME_BINARIES, 23 std::unique_ptr<AppRegistrationData>(
24 scoped_ptr<AppRegistrationData>(new NonUpdatingAppRegistrationData( 24 new NonUpdatingAppRegistrationData(
25 base::string16(L"Software\\").append(kChromiumBinariesName)))), 25 base::string16(L"Software\\")
26 .append(kChromiumBinariesName)))),
26 browser_distribution_( 27 browser_distribution_(
27 BrowserDistribution::GetSpecificDistribution(CHROME_BROWSER)) { 28 BrowserDistribution::GetSpecificDistribution(CHROME_BROWSER)) {}
28 }
29 29
30 ChromiumBinariesDistribution::ChromiumBinariesDistribution( 30 ChromiumBinariesDistribution::ChromiumBinariesDistribution(
31 scoped_ptr<AppRegistrationData> app_reg_data) 31 std::unique_ptr<AppRegistrationData> app_reg_data)
32 : BrowserDistribution(CHROME_BINARIES, std::move(app_reg_data)), 32 : BrowserDistribution(CHROME_BINARIES, std::move(app_reg_data)),
33 browser_distribution_( 33 browser_distribution_(
34 BrowserDistribution::GetSpecificDistribution(CHROME_BROWSER)) {} 34 BrowserDistribution::GetSpecificDistribution(CHROME_BROWSER)) {}
35 35
36 base::string16 ChromiumBinariesDistribution::GetBaseAppName() { 36 base::string16 ChromiumBinariesDistribution::GetBaseAppName() {
37 NOTREACHED(); 37 NOTREACHED();
38 return base::string16(); 38 return base::string16();
39 } 39 }
40 40
41 base::string16 ChromiumBinariesDistribution::GetBrowserProgIdPrefix() { 41 base::string16 ChromiumBinariesDistribution::GetBrowserProgIdPrefix() {
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 } 111 }
112 112
113 bool ChromiumBinariesDistribution::GetChromeChannel(base::string16* channel) { 113 bool ChromiumBinariesDistribution::GetChromeChannel(base::string16* channel) {
114 NOTREACHED(); 114 NOTREACHED();
115 return false; 115 return false;
116 } 116 }
117 117
118 base::string16 ChromiumBinariesDistribution::GetCommandExecuteImplClsid() { 118 base::string16 ChromiumBinariesDistribution::GetCommandExecuteImplClsid() {
119 return base::string16(); 119 return base::string16();
120 } 120 }
OLDNEW
« no previous file with comments | « chrome/installer/util/chromium_binaries_distribution.h ('k') | chrome/installer/util/conditional_work_item_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698