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

Unified Diff: chrome/installer/util/master_preferences.h

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/lzma_file_allocator_unittest.cc ('k') | chrome/installer/util/master_preferences.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/master_preferences.h
diff --git a/chrome/installer/util/master_preferences.h b/chrome/installer/util/master_preferences.h
index afaf31924821adb886bda41016ee799a642215c8..424c4dfdec6d2bfedc0ec8a8212b0382c71e3f06 100644
--- a/chrome/installer/util/master_preferences.h
+++ b/chrome/installer/util/master_preferences.h
@@ -8,12 +8,12 @@
#ifndef CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_
#define CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_
+#include <memory>
#include <string>
#include <vector>
#include "base/command_line.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "build/build_config.h"
namespace base {
@@ -208,7 +208,7 @@ class MasterPreferences {
// copied over to profile preferences.
std::string ExtractPrefString(const std::string& name) const;
- scoped_ptr<base::DictionaryValue> master_dictionary_;
+ std::unique_ptr<base::DictionaryValue> master_dictionary_;
base::DictionaryValue* distribution_;
bool preferences_read_from_file_;
bool chrome_;
« no previous file with comments | « chrome/installer/util/lzma_file_allocator_unittest.cc ('k') | chrome/installer/util/master_preferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698