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

Unified Diff: chrome/browser/chromeos/policy/cloud_external_data_policy_observer.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/policy/cloud_external_data_policy_observer.h
diff --git a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h
index 6793a352f2280617d73565b92a2c259347f40ca9..a11477be9b87b84524081c30046f0c1df93cd531 100644
--- a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h
+++ b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h
@@ -6,12 +6,12 @@
#define CHROME_BROWSER_CHROMEOS_POLICY_CLOUD_EXTERNAL_DATA_POLICY_OBSERVER_H_
#include <map>
+#include <memory>
#include <string>
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/linked_ptr.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
@@ -51,7 +51,7 @@ class CloudExternalDataPolicyObserver
// called at all.
virtual void OnExternalDataFetched(const std::string& policy,
const std::string& user_id,
- scoped_ptr<std::string> data);
+ std::unique_ptr<std::string> data);
protected:
virtual ~Delegate();
@@ -89,7 +89,7 @@ class CloudExternalDataPolicyObserver
const PolicyMap::Entry* entry);
void OnExternalDataFetched(const std::string& user_id,
- scoped_ptr<std::string> data);
+ std::unique_ptr<std::string> data);
// A map from each device-local account user ID to its current policy map
// entry for |policy_|.
@@ -111,7 +111,7 @@ class CloudExternalDataPolicyObserver
Delegate* delegate_;
content::NotificationRegistrar notification_registrar_;
- scoped_ptr<chromeos::CrosSettings::ObserverSubscription>
+ std::unique_ptr<chromeos::CrosSettings::ObserverSubscription>
device_local_accounts_subscription_;
// A map from user ID to a base::WeakPtr for each external data fetch

Powered by Google App Engine
This is Rietveld 408576698