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

Unified Diff: chrome/installer/util/browser_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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/util/browser_distribution.h ('k') | chrome/installer/util/chrome_frame_distribution.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/browser_distribution.cc
diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc
index c9be46dfdf0d226803944be8a50594a13a1434e0..d680d96b4529c99251fbb2e0102856cac344af17 100644
--- a/chrome/installer/util/browser_distribution.cc
+++ b/chrome/installer/util/browser_distribution.cc
@@ -15,6 +15,7 @@
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/logging.h"
+#include "base/memory/ptr_util.h"
#include "base/win/registry.h"
#include "base/win/windows_version.h"
#include "chrome/common/chrome_icon_resources_win.h"
@@ -54,13 +55,12 @@ BrowserDistribution::Type GetCurrentDistributionType() {
BrowserDistribution::BrowserDistribution()
: type_(CHROME_BROWSER),
- app_reg_data_(make_scoped_ptr(
- new NonUpdatingAppRegistrationData(L"Software\\Chromium"))) {
-}
+ app_reg_data_(base::WrapUnique(
+ new NonUpdatingAppRegistrationData(L"Software\\Chromium"))) {}
BrowserDistribution::BrowserDistribution(
Type type,
- scoped_ptr<AppRegistrationData> app_reg_data)
+ std::unique_ptr<AppRegistrationData> app_reg_data)
: type_(type), app_reg_data_(std::move(app_reg_data)) {}
BrowserDistribution::~BrowserDistribution() {}
« no previous file with comments | « chrome/installer/util/browser_distribution.h ('k') | chrome/installer/util/chrome_frame_distribution.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698