Add Chrome OS-specific controlled setting indicators

Add Chrome OS-specific controlled setting indicators

This completes the addition of controlled setting indicators to the
Chrome settings UI.

BUG=104955
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=164135

[bartfab (slow), 2012-10-24 14:48:16]

Hi James, could you take a look at the UI part of this CL?
Hi Joao, could you take a look at the policy browser test part of this CL?

FYI, this is the *last* CL adding controlled setting indicators (for now :).

[James Hawkins, 2012-10-24 15:14:41]

LGTM with nit.

https://codereview.chromium.org/11276006/diff/1/chrome/browser/resources/opti...
File chrome/browser/resources/options/chromeos/accounts_options.js (right):

https://codereview.chromium.org/11276006/diff/1/chrome/browser/resources/opti...
chrome/browser/resources/options/chromeos/accounts_options.js:45: // If the
current user is not the owner or the device is enterprise
nit: Insert a comma: "not the owner, or the device"

[Joao da Silva, 2012-10-24 16:26:17]

lgtm

https://codereview.chromium.org/11276006/diff/1/chrome/browser/policy/policy_...
File chrome/browser/policy/policy_prefs_browsertest.cc (right):

https://codereview.chromium.org/11276006/diff/1/chrome/browser/policy/policy_...
chrome/browser/policy/policy_prefs_browsertest.cc:57: const char
kCrosSettingsPrefix[] = "cros.";
This is chromeos::kCrosSettingsPrefix from
chrome/browser/chromeos/settings/cros_settings_names.h

https://codereview.chromium.org/11276006/diff/1/chrome/browser/policy/policy_...
chrome/browser/policy/policy_prefs_browsertest.cc:510: if
(StartsWithASCII((*pref_mapping)->pref(), kCrosSettingsPrefix, true))
Add a comment ("Skip chromeos preferences" or similar)

https://codereview.chromium.org/11276006/diff/1/chrome/browser/policy/policy_...
chrome/browser/policy/policy_prefs_browsertest.cc:628: ASSERT_TRUE(pref);
Move the |pref| definition here too, closer to where it's used

https://codereview.chromium.org/11276006/diff/1/chrome/test/data/policy/polic...
File chrome/test/data/policy/policy_test_cases.json (right):

https://codereview.chromium.org/11276006/diff/1/chrome/test/data/policy/polic...
chrome/test/data/policy/policy_test_cases.json:1576: "note": "TODO(bartfab) This
actually maps to |gdata.disabled|. However, setting the policy in order to test
its pref mapping spins up FileBrowserEventRouter which is then unable to shut
down cleanly in the browser test environment."
Can't that be fixed? :-)

[bartfab (slow), 2012-10-24 17:33:50]

https://codereview.chromium.org/11276006/diff/1/chrome/browser/policy/policy_...
File chrome/browser/policy/policy_prefs_browsertest.cc (right):

https://codereview.chromium.org/11276006/diff/1/chrome/browser/policy/policy_...
chrome/browser/policy/policy_prefs_browsertest.cc:57: const char
kCrosSettingsPrefix[] = "cros.";
On 2012/10/24 16:26:17, Joao da Silva wrote:
> This is chromeos::kCrosSettingsPrefix from
> chrome/browser/chromeos/settings/cros_settings_names.h

Done.

https://codereview.chromium.org/11276006/diff/1/chrome/browser/policy/policy_...
chrome/browser/policy/policy_prefs_browsertest.cc:510: if
(StartsWithASCII((*pref_mapping)->pref(), kCrosSettingsPrefix, true))
On 2012/10/24 16:26:17, Joao da Silva wrote:
> Add a comment ("Skip chromeos preferences" or similar)

Done.

https://codereview.chromium.org/11276006/diff/1/chrome/browser/policy/policy_...
chrome/browser/policy/policy_prefs_browsertest.cc:628: ASSERT_TRUE(pref);
On 2012/10/24 16:26:17, Joao da Silva wrote:
> Move the |pref| definition here too, closer to where it's used

Done.

https://codereview.chromium.org/11276006/diff/1/chrome/browser/resources/opti...
File chrome/browser/resources/options/chromeos/accounts_options.js (right):

https://codereview.chromium.org/11276006/diff/1/chrome/browser/resources/opti...
chrome/browser/resources/options/chromeos/accounts_options.js:45: // If the
current user is not the owner or the device is enterprise
On 2012/10/24 15:14:41, James Hawkins wrote:
> nit: Insert a comma: "not the owner, or the device"

Done.

https://codereview.chromium.org/11276006/diff/1/chrome/test/data/policy/polic...
File chrome/test/data/policy/policy_test_cases.json (right):

https://codereview.chromium.org/11276006/diff/1/chrome/test/data/policy/polic...
chrome/test/data/policy/policy_test_cases.json:1576: "note": "TODO(bartfab) This
actually maps to |gdata.disabled|. However, setting the policy in order to test
its pref mapping spins up FileBrowserEventRouter which is then unable to shut
down cleanly in the browser test environment."
I worked around the issue and filed crbug.com/157611 for the underlying cause.

[commit-bot: I haz the power, 2012-10-25 12:51:49]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bartfab@chromium.org/11276006/10001

[commit-bot: I haz the power, 2012-10-25 15:09:34]

Retried try job too often for step(s) browser_tests

[commit-bot: I haz the power, 2012-10-25 15:21:37]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bartfab@chromium.org/11276006/10001

[commit-bot: I haz the power, 2012-10-25 17:09:20]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bartfab@chromium.org/11276006/14002

[commit-bot: I haz the power, 2012-10-25 19:13:47]

Change committed as 164135