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

Unified Diff: chrome/browser/chromeos/policy/login_profile_policy_provider.cc

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/login_profile_policy_provider.cc
diff --git a/chrome/browser/chromeos/policy/login_profile_policy_provider.cc b/chrome/browser/chromeos/policy/login_profile_policy_provider.cc
index c0bd83a02c2d585d13ceea6c911fc487668cf676..2b802d01b720e527276b522543b33e9422314403 100644
--- a/chrome/browser/chromeos/policy/login_profile_policy_provider.cc
+++ b/chrome/browser/chromeos/policy/login_profile_policy_provider.cc
@@ -4,12 +4,12 @@
#include "chrome/browser/chromeos/policy/login_profile_policy_provider.h"
+#include <memory>
#include <string>
#include <utility>
#include "base/bind.h"
#include "base/callback.h"
-#include "base/memory/scoped_ptr.h"
#include "base/values.h"
#include "chromeos/dbus/power_policy_controller.h"
#include "components/policy/core/browser/policy_error_map.h"
@@ -32,24 +32,24 @@ const char kActionLogout[] = "Logout";
const char kActionShutdown[] = "Shutdown";
const char kActionDoNothing[] = "DoNothing";
-scoped_ptr<base::Value> GetAction(const std::string &action) {
+std::unique_ptr<base::Value> GetAction(const std::string& action) {
if (action == kActionSuspend) {
- return scoped_ptr<base::Value>(new base::FundamentalValue(
+ return std::unique_ptr<base::Value>(new base::FundamentalValue(
chromeos::PowerPolicyController::ACTION_SUSPEND));
}
if (action == kActionLogout) {
- return scoped_ptr<base::Value>(new base::FundamentalValue(
+ return std::unique_ptr<base::Value>(new base::FundamentalValue(
chromeos::PowerPolicyController::ACTION_STOP_SESSION));
}
if (action == kActionShutdown) {
- return scoped_ptr<base::Value>(new base::FundamentalValue(
+ return std::unique_ptr<base::Value>(new base::FundamentalValue(
chromeos::PowerPolicyController::ACTION_SHUT_DOWN));
}
if (action == kActionDoNothing) {
- return scoped_ptr<base::Value>(new base::FundamentalValue(
+ return std::unique_ptr<base::Value>(new base::FundamentalValue(
chromeos::PowerPolicyController::ACTION_DO_NOTHING));
}
- return scoped_ptr<base::Value>();
+ return std::unique_ptr<base::Value>();
}
@@ -145,7 +145,7 @@ void LoginProfilePolicyProvider::UpdateFromDevicePolicy() {
const PolicyNamespace chrome_namespaces(POLICY_DOMAIN_CHROME, std::string());
const PolicyMap& device_policy_map =
device_policy_service_->GetPolicies(chrome_namespaces);
- scoped_ptr<PolicyBundle> bundle(new PolicyBundle);
+ std::unique_ptr<PolicyBundle> bundle(new PolicyBundle);
PolicyMap& user_policy_map = bundle->Get(chrome_namespaces);
ApplyDevicePolicyAsRecommendedPolicy(
@@ -173,12 +173,12 @@ void LoginProfilePolicyProvider::UpdateFromDevicePolicy() {
device_policy_map.GetValue(key::kDeviceLoginScreenPowerManagement);
const base::DictionaryValue* dict = NULL;
if (value && value->GetAsDictionary(&dict)) {
- scoped_ptr<base::DictionaryValue> policy_value(dict->DeepCopy());
+ std::unique_ptr<base::DictionaryValue> policy_value(dict->DeepCopy());
std::string lid_close_action;
base::Value* screen_dim_delay_scale = NULL;
if (policy_value->GetString(kLidCloseAction, &lid_close_action)) {
- scoped_ptr<base::Value> action = GetAction(lid_close_action);
+ std::unique_ptr<base::Value> action = GetAction(lid_close_action);
if (action) {
ApplyValueAsMandatoryPolicy(
action.get(), key::kLidCloseAction, &user_policy_map);

Powered by Google App Engine
This is Rietveld 408576698