Index: chrome/browser/extensions/api/managed_mode_private/managed_mode_private_api.cc |
diff --git a/chrome/browser/extensions/api/managed_mode_private/managed_mode_private_api.cc b/chrome/browser/extensions/api/managed_mode_private/managed_mode_private_api.cc |
index af1319d6591a217ebe384a251ffc570c8fa81c56..851af7193464d6ede7fb3a5e20cd86b716a68fa2 100644 |
--- a/chrome/browser/extensions/api/managed_mode_private/managed_mode_private_api.cc |
+++ b/chrome/browser/extensions/api/managed_mode_private/managed_mode_private_api.cc |
@@ -19,6 +19,7 @@ |
#include "chrome/browser/managed_mode/managed_mode.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/common/chrome_notification_types.h" |
+#include "chrome/common/extensions/api/managed_mode_private.h" |
#include "chrome/common/pref_names.h" |
#include "content/public/browser/notification_details.h" |
@@ -26,6 +27,9 @@ |
#include "chrome/browser/policy/managed_mode_policy_provider.h" |
#endif |
+namespace GetPolicy = extensions::api::managed_mode_private::GetPolicy; |
cduvall
2013/03/05 21:59:39
Move into namespace extensions block.
Aaron Jacobs
2013/03/05 22:56:02
Done.
|
+namespace SetPolicy = extensions::api::managed_mode_private::SetPolicy; |
+ |
namespace { |
// Event that is fired when we enter or leave managed mode. |
@@ -97,12 +101,12 @@ void ManagedModePrivateEnterFunction::SendResult(bool success) { |
ManagedModePrivateGetPolicyFunction::~ManagedModePrivateGetPolicyFunction() { } |
bool ManagedModePrivateGetPolicyFunction::RunImpl() { |
- std::string key; |
- EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &key)); |
+ scoped_ptr<GetPolicy::Params> params(GetPolicy::Params::Create(*args_)); |
+ EXTENSION_FUNCTION_VALIDATE(params.get()); |
#if defined(ENABLE_CONFIGURATION_POLICY) |
policy::ManagedModePolicyProvider* policy_provider = |
profile_->GetManagedModePolicyProvider(); |
- const base::Value* policy = policy_provider->GetPolicy(key); |
+ const base::Value* policy = policy_provider->GetPolicy(params->key); |
if (policy) |
SetResult(policy->DeepCopy()); |
#endif |
@@ -112,14 +116,12 @@ bool ManagedModePrivateGetPolicyFunction::RunImpl() { |
ManagedModePrivateSetPolicyFunction::~ManagedModePrivateSetPolicyFunction() { } |
bool ManagedModePrivateSetPolicyFunction::RunImpl() { |
- std::string key; |
- EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &key)); |
- base::Value* value = NULL; |
- EXTENSION_FUNCTION_VALIDATE(args_->Get(1, &value)); |
+ scoped_ptr<SetPolicy::Params> params(SetPolicy::Params::Create(*args_)); |
+ EXTENSION_FUNCTION_VALIDATE(params.get()); |
#if defined(ENABLE_CONFIGURATION_POLICY) |
policy::ManagedModePolicyProvider* policy_provider = |
profile_->GetManagedModePolicyProvider(); |
- policy_provider->SetPolicy(key, value); |
+ policy_provider->SetPolicy(params->key, params->value.get()); |
#endif |
return true; |
} |