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

Unified Diff: chrome/browser/chromeos/mobile_config.h

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
Index: chrome/browser/chromeos/mobile_config.h
diff --git a/chrome/browser/chromeos/mobile_config.h b/chrome/browser/chromeos/mobile_config.h
index 934325263fb7debfb1cb10a07567d795fbcb4770..d43b5911dab300f58e59e261393bee93a3d5fce9 100644
--- a/chrome/browser/chromeos/mobile_config.h
+++ b/chrome/browser/chromeos/mobile_config.h
@@ -6,12 +6,12 @@
#define CHROME_BROWSER_CHROMEOS_MOBILE_CONFIG_H_
#include <map>
+#include <memory>
#include <string>
#include <vector>
#include "base/gtest_prod_util.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/singleton.h"
#include "base/time/time.h"
#include "chrome/browser/chromeos/customization/customization_document.h"
@@ -190,14 +190,14 @@ class MobileConfig : public CustomizationDocument {
Carriers carriers_;
// Initial locale specific config if defined.
- scoped_ptr<LocaleConfig> locale_config_;
+ std::unique_ptr<LocaleConfig> locale_config_;
// Initial locale value.
std::string initial_locale_;
// Root value of the local config (if it exists).
// Global config is stored in root_ of the base class.
- scoped_ptr<base::DictionaryValue> local_config_root_;
+ std::unique_ptr<base::DictionaryValue> local_config_root_;
DISALLOW_COPY_AND_ASSIGN(MobileConfig);
};
« no previous file with comments | « chrome/browser/chromeos/mobile/mobile_activator_unittest.cc ('k') | chrome/browser/chromeos/mobile_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698