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

Unified Diff: chrome/browser/chromeos/settings/cros_settings.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/settings/cros_settings.h
diff --git a/chrome/browser/chromeos/settings/cros_settings.h b/chrome/browser/chromeos/settings/cros_settings.h
index 569eb3f083d43713d6058f6dc335f7f672c2ff38..ff6518a32962ddcfb454fc87e0b9aca495926dfa 100644
--- a/chrome/browser/chromeos/settings/cros_settings.h
+++ b/chrome/browser/chromeos/settings/cros_settings.h
@@ -5,6 +5,7 @@
#ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_CROS_SETTINGS_H_
#define CHROME_BROWSER_CHROMEOS_SETTINGS_CROS_SETTINGS_H_
+#include <memory>
#include <string>
#include <vector>
@@ -12,7 +13,6 @@
#include "base/callback_list.h"
#include "base/containers/hash_tables.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/threading/non_thread_safe.h"
#include "chromeos/settings/cros_settings_names.h"
#include "chromeos/settings/cros_settings_provider.h"
@@ -112,7 +112,7 @@ class CrosSettings : public base::NonThreadSafe {
// Add an observer Callback for changes for the given |path|.
typedef base::CallbackList<void(void)>::Subscription ObserverSubscription;
- scoped_ptr<ObserverSubscription> AddSettingsObserver(
+ std::unique_ptr<ObserverSubscription> AddSettingsObserver(
const std::string& path,
const base::Closure& callback);
« no previous file with comments | « chrome/browser/chromeos/session_length_limiter_unittest.cc ('k') | chrome/browser/chromeos/settings/cros_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698