summaryrefslogtreecommitdiffstats
path: root/chrome/browser/automation
diff options
context:
space:
mode:
authorbartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-26 18:03:09 +0000
committerbartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-26 18:03:09 +0000
commit477eeef7a2245363b604121bc6c54f5b41c97143 (patch)
tree9da9a0168cefd11868695230ec13bfab4bb30e5a /chrome/browser/automation
parent94830dbaee545e071aec62ca89459013e017c1c7 (diff)
downloadchromium_src-477eeef7a2245363b604121bc6c54f5b41c97143.zip
chromium_src-477eeef7a2245363b604121bc6c54f5b41c97143.tar.gz
chromium_src-477eeef7a2245363b604121bc6c54f5b41c97143.tar.bz2
Expose which policies are device policies in automation provider
This CL extends the automation provider's GetPolicyDefinitionList method to include a flag distinguishing device policies from user policies. The information is necessary to set policies correctly during testing. BUG=chromium-os:28027 TEST=policy_prefs_ui.py on Chrome OS and Linux desktop Review URL: http://codereview.chromium.org/9845026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128947 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation')
-rw-r--r--chrome/browser/automation/testing_automation_provider.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index d2dfbdb..38d8121 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -6281,7 +6281,12 @@ void TestingAutomationProvider::GetPolicyDefinitionList(
reply.SendError(error + entry->name);
return;
}
- response.SetString(entry->name, types[entry->value_type]);
+ Value* type = Value::CreateStringValue(types[entry->value_type]);
+ Value* device_policy = Value::CreateBooleanValue(entry->device_policy);
+ ListValue* definition = new ListValue;
+ definition->Append(type);
+ definition->Append(device_policy);
+ response.Set(entry->name, definition);
}
reply.SendSuccess(&response);