Convert chrome://policy to new WebUI style

Convert chrome://policy to new WebUI style

This CL converts the chrome://policy page to the new WebUI style. The page
reuses as much CSS/JS from the überpage as possible to ensure consistency.

The CL also improves the page in many ways:
* Proper separation of policy value aggregation (C++) and
  presentation (WebUI)
* Better handling of policy values that overflow the available space
  (an extra table row can be toggled that shows the whole value)
* New PolicyUIHandler backend that will be shared with the imminent more
  user-friendly chrome://policy page (see bug 134849).
* Removal of dependency on JS templating engine with its copious use of
  eval().
* New browser test that verifies policy definitions and values are sent
  from the C++ backend to the WebUI and processed there correctly.

TEST=browser_tests and manual
BUG=chromium-os:26628
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=180684

[bartfab (slow), 2013-01-30 14:03:17]

Hi James,

Could you please take a look at this CL?

Hi Mattias,

Could you please look at the policy side of this CL?

[James Hawkins, 2013-01-30 16:22:29]

Please attach before/after screenshots.

https://codereview.chromium.org/12084065/diff/15001/chrome/browser/resources/...
File chrome/browser/resources/policy.css (right):

https://codereview.chromium.org/12084065/diff/15001/chrome/browser/resources/...
chrome/browser/resources/policy.css:14: div#filter-overlay {
Do you mean 'div #filter-overlay'?

[Mattias Nissler (ping if slow), 2013-01-30 16:34:59]

First round of comments, I didn't look closely at the javascripts or the tests
yet

https://codereview.chromium.org/12084065/diff/15001/chrome/app/generated_reso...
File chrome/app/generated_resources.grd (right):

https://codereview.chromium.org/12084065/diff/15001/chrome/app/generated_reso...
chrome/app/generated_resources.grd:5962: +      <!-- chrome://policy -->
Aren't the messages above also part of chrome://policy ?

https://codereview.chromium.org/12084065/diff/15001/chrome/browser/ui/webui/p...
File chrome/browser/ui/webui/policy_ui.cc (right):

https://codereview.chromium.org/12084065/diff/15001/chrome/browser/ui/webui/p...
chrome/browser/ui/webui/policy_ui.cc:320: dict->SetString("domain", domain_);
Shouldn't this call GetStatusFromCore(core_) as well?

https://codereview.chromium.org/12084065/diff/15001/chrome/browser/ui/webui/p...
chrome/browser/ui/webui/policy_ui.cc:389: } else  {
remove stray space

https://codereview.chromium.org/12084065/diff/15001/chrome/browser/ui/webui/p...
chrome/browser/ui/webui/policy_ui.cc:459: value->SetBoolean("device", true);
suggestion: For clarity, you could set a string property named "scope" here with
the values "machine" or "user"

https://codereview.chromium.org/12084065/diff/15001/chrome/browser/ui/webui/p...
chrome/browser/ui/webui/policy_ui.cc:461: value->SetBoolean("recommended",
true);
same here: "level" -> "recommended" or "mandatory"

https://codereview.chromium.org/12084065/diff/15001/chrome/browser/ui/webui/p...
chrome/browser/ui/webui/policy_ui.cc:475: device_status->SetString("domain",
device_domain_);
unused?

https://codereview.chromium.org/12084065/diff/15001/chrome/browser/ui/webui/p...
chrome/browser/ui/webui/policy_ui.cc:524: definitions.SetBoolean(entry->name,
true);
Why not send a list of names?

https://codereview.chromium.org/12084065/diff/15001/chrome/browser/ui/webui/p...
File chrome/browser/ui/webui/policy_ui.h (right):

https://codereview.chromium.org/12084065/diff/15001/chrome/browser/ui/webui/p...
chrome/browser/ui/webui/policy_ui.h:23: class PolicyService;
This is #included

https://codereview.chromium.org/12084065/diff/15001/chrome/browser/ui/webui/p...
chrome/browser/ui/webui/policy_ui.h:47: void SendStatus() const;
These could use some documentation

https://codereview.chromium.org/12084065/diff/15001/chrome/browser/ui/webui/p...
chrome/browser/ui/webui/policy_ui.h:50: void HandleReloadPolicies(const
base::ListValue* args);
forward-declare ListValue

https://codereview.chromium.org/12084065/diff/15001/chrome/browser/ui/webui/p...
chrome/browser/ui/webui/policy_ui.h:81: // The Web UI handler for the
chrome://policy page.
s/handler/controller/

[bartfab (slow), 2013-01-31 14:24:17]

https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/app/generat...
File chrome/app/generated_resources.grd (right):

https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/app/generat...
chrome/app/generated_resources.grd:5962: +      <!-- chrome://policy -->
On 2013/01/30 16:34:59, Mattias Nissler wrote:
> Aren't the messages above also part of chrome://policy ?

These constants are used outside the Policy UI code, e.g. in policy_error_map.cc
and message_util.cc. They were separated from the chrome://policy constants by a
blank line before and I kept it that way.

The three constants IDS_POLICY_OK, IDS_POLICY_UNSET and IDS_POLICY_UNKNOWN
actually are used by chrome://policy directly. I still put them in the above
block for consistency as they are policy statuses, just like the 30 or more
constants above them.

https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/browser/res...
File chrome/browser/resources/policy.css (right):

https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/browser/res...
chrome/browser/resources/policy.css:14: div#filter-overlay {
On 2013/01/30 16:22:29, James Hawkins wrote:
> Do you mean 'div #filter-overlay'?

I meant "the element with id 'filter-overlay'". The "div" is not strictly
necessary (the id should be unique after all) but I like to be explicit about
what tag CSS rules apply to. If you prefer, I can change this rule to just
"#filter-overlay".

https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/browser/ui/...
File chrome/browser/ui/webui/policy_ui.cc (right):

https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/browser/ui/...
chrome/browser/ui/webui/policy_ui.cc:320: dict->SetString("domain", domain_);
On 2013/01/30 16:34:59, Mattias Nissler wrote:
> Shouldn't this call GetStatusFromCore(core_) as well?

Yep. I discovered this as well when I visited chrome://policy on Chrome OS and
saw the domain name only :).

Done.

https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/browser/ui/...
chrome/browser/ui/webui/policy_ui.cc:389: } else  {
On 2013/01/30 16:34:59, Mattias Nissler wrote:
> remove stray space

Done.

https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/browser/ui/...
chrome/browser/ui/webui/policy_ui.cc:459: value->SetBoolean("device", true);
On 2013/01/30 16:34:59, Mattias Nissler wrote:
> suggestion: For clarity, you could set a string property named "scope" here
with
> the values "machine" or "user"

Done.

https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/browser/ui/...
chrome/browser/ui/webui/policy_ui.cc:461: value->SetBoolean("recommended",
true);
On 2013/01/30 16:34:59, Mattias Nissler wrote:
> same here: "level" -> "recommended" or "mandatory"

Done.

https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/browser/ui/...
chrome/browser/ui/webui/policy_ui.cc:475: device_status->SetString("domain",
device_domain_);
On 2013/01/30 16:34:59, Mattias Nissler wrote:
> unused?

Used for device policy. For user policy, the username is shown. For device
policy, the enrollment domain is shown.

https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/browser/ui/...
chrome/browser/ui/webui/policy_ui.cc:524: definitions.SetBoolean(entry->name,
true);
On 2013/01/30 16:34:59, Mattias Nissler wrote:
> Why not send a list of names?

It similifies the JS code. A dict allows looping (just like a list would) but
also is-in checks, e.g. "if (!(name in this.policies_))".

https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/browser/ui/...
File chrome/browser/ui/webui/policy_ui.h (right):

https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/browser/ui/...
chrome/browser/ui/webui/policy_ui.h:23: class PolicyService;
On 2013/01/30 16:34:59, Mattias Nissler wrote:
> This is #included

Done.

https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/browser/ui/...
chrome/browser/ui/webui/policy_ui.h:47: void SendStatus() const;
On 2013/01/30 16:34:59, Mattias Nissler wrote:
> These could use some documentation

Done.

https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/browser/ui/...
chrome/browser/ui/webui/policy_ui.h:50: void HandleReloadPolicies(const
base::ListValue* args);
On 2013/01/30 16:34:59, Mattias Nissler wrote:
> forward-declare ListValue

Done.

https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/browser/ui/...
chrome/browser/ui/webui/policy_ui.h:81: // The Web UI handler for the
chrome://policy page.
On 2013/01/30 16:34:59, Mattias Nissler wrote:
> s/handler/controller/

Done.

[James Hawkins, 2013-01-31 17:08:04]

LGTM with nits.

https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/browser/res...
File chrome/browser/resources/policy.css (right):

https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/browser/res...
chrome/browser/resources/policy.css:14: div#filter-overlay {
On 2013/01/31 14:24:17, bartfab wrote:
> On 2013/01/30 16:22:29, James Hawkins wrote:
> > Do you mean 'div #filter-overlay'?
> 
> I meant "the element with id 'filter-overlay'". The "div" is not strictly
> necessary (the id should be unique after all) but I like to be explicit about
> what tag CSS rules apply to. If you prefer, I can change this rule to just
> "#filter-overlay".

nit: Particularly, I meant add a space between div and #filter-overlay.

https://chromiumcodereview.appspot.com/12084065/diff/1015/chrome/browser/reso...
File chrome/browser/resources/policy.js (right):

https://chromiumcodereview.appspot.com/12084065/diff/1015/chrome/browser/reso...
chrome/browser/resources/policy.js:141: for (var i = 0; i < divs.length; ++i) {
nit: i++

Here and elsewhere.

https://chromiumcodereview.appspot.com/12084065/diff/1015/chrome/browser/ui/w...
File chrome/browser/ui/webui/policy_ui.cc (right):

https://chromiumcodereview.appspot.com/12084065/diff/1015/chrome/browser/ui/w...
chrome/browser/ui/webui/policy_ui.cc:219: // CloudPolicyCoreStatusProvider:
nit: // CloudPolicyCoreStatusProvider implementation.

Here and elsewhere.

[bartfab (slow), 2013-01-31 17:36:12]

Nits addressed.

https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/browser/res...
File chrome/browser/resources/policy.css (right):

https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/browser/res...
chrome/browser/resources/policy.css:14: div#filter-overlay {
But this is entirely different:

"div#filter-overlay" selects a div that has id 'filter-overlay'

"div #filter-overlay" selects an element that has id 'filter-overlay' and is a
child of a div

What I need here is the former, not the latter.

On 2013/01/31 17:08:04, James Hawkins wrote:
> On 2013/01/31 14:24:17, bartfab wrote:
> > On 2013/01/30 16:22:29, James Hawkins wrote:
> > > Do you mean 'div #filter-overlay'?
> > 
> > I meant "the element with id 'filter-overlay'". The "div" is not strictly
> > necessary (the id should be unique after all) but I like to be explicit
about
> > what tag CSS rules apply to. If you prefer, I can change this rule to just
> > "#filter-overlay".
> 
> nit: Particularly, I meant add a space between div and #filter-overlay.

https://chromiumcodereview.appspot.com/12084065/diff/1015/chrome/browser/reso...
File chrome/browser/resources/policy.js (right):

https://chromiumcodereview.appspot.com/12084065/diff/1015/chrome/browser/reso...
chrome/browser/resources/policy.js:141: for (var i = 0; i < divs.length; ++i) {
On 2013/01/31 17:08:05, James Hawkins wrote:
> nit: i++
> 
> Here and elsewhere.

Done.

https://chromiumcodereview.appspot.com/12084065/diff/1015/chrome/browser/ui/w...
File chrome/browser/ui/webui/policy_ui.cc (right):

https://chromiumcodereview.appspot.com/12084065/diff/1015/chrome/browser/ui/w...
chrome/browser/ui/webui/policy_ui.cc:219: // CloudPolicyCoreStatusProvider:
People seem to disagree on style here. Some strongly prefer "// BaseClass:",
others strongy prefer "// BaseClass implementation."

I changed the code to the latter now. Done.

On 2013/01/31 17:08:05, James Hawkins wrote:
> nit: // CloudPolicyCoreStatusProvider implementation.
> 
> Here and elsewhere.

[James Hawkins, 2013-01-31 17:48:22]

https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/browser/res...
File chrome/browser/resources/policy.css (right):

https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/browser/res...
chrome/browser/resources/policy.css:14: div#filter-overlay {
On 2013/01/31 17:36:13, bartfab wrote:
> But this is entirely different:
> 
> "div#filter-overlay" selects a div that has id 'filter-overlay'
> 
> "div #filter-overlay" selects an element that has id 'filter-overlay' and is a
> child of a div
> 
> What I need here is the former, not the latter.
> 
> On 2013/01/31 17:08:04, James Hawkins wrote:
> > On 2013/01/31 14:24:17, bartfab wrote:
> > > On 2013/01/30 16:22:29, James Hawkins wrote:
> > > > Do you mean 'div #filter-overlay'?
> > > 
> > > I meant "the element with id 'filter-overlay'". The "div" is not strictly
> > > necessary (the id should be unique after all) but I like to be explicit
> about
> > > what tag CSS rules apply to. If you prefer, I can change this rule to just
> > > "#filter-overlay".
> > 
> > nit: Particularly, I meant add a space between div and #filter-overlay.
> 

Gotcha, didn't know what you were originally intending.  I would remove the div
because it introduces ambiguity of intention.

[bartfab (slow), 2013-01-31 17:55:47]

On 2013/01/31 17:48:22, James Hawkins wrote:
>
https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/browser/res...
> File chrome/browser/resources/policy.css (right):
> 
>
https://chromiumcodereview.appspot.com/12084065/diff/15001/chrome/browser/res...
> chrome/browser/resources/policy.css:14: div#filter-overlay {
> On 2013/01/31 17:36:13, bartfab wrote:
> > But this is entirely different:
> > 
> > "div#filter-overlay" selects a div that has id 'filter-overlay'
> > 
> > "div #filter-overlay" selects an element that has id 'filter-overlay' and is
a
> > child of a div
> > 
> > What I need here is the former, not the latter.
> > 
> > On 2013/01/31 17:08:04, James Hawkins wrote:
> > > On 2013/01/31 14:24:17, bartfab wrote:
> > > > On 2013/01/30 16:22:29, James Hawkins wrote:
> > > > > Do you mean 'div #filter-overlay'?
> > > > 
> > > > I meant "the element with id 'filter-overlay'". The "div" is not
strictly
> > > > necessary (the id should be unique after all) but I like to be explicit
> > about
> > > > what tag CSS rules apply to. If you prefer, I can change this rule to
just
> > > > "#filter-overlay".
> > > 
> > > nit: Particularly, I meant add a space between div and #filter-overlay.
> > 
> 
> Gotcha, didn't know what you were originally intending.  I would remove the
div
> because it introduces ambiguity of intention.

Done. I did the same for all other CSS selectors that use an id as well.

[bartfab (slow), 2013-02-04 15:11:54]

Hi Mattias, friendly review ping

[Mattias Nissler (ping if slow), 2013-02-04 16:05:15]

LGTM with nits.

https://chromiumcodereview.appspot.com/12084065/diff/12/chrome/browser/resour...
File chrome/browser/resources/policy.js (right):

https://chromiumcodereview.appspot.com/12084065/diff/12/chrome/browser/resour...
chrome/browser/resources/policy.js:94: this.unset = !value;
Just to make sure: So integer policies with value 0 don't trigger this?

https://chromiumcodereview.appspot.com/12084065/diff/12/chrome/browser/ui/web...
File chrome/browser/ui/webui/policy_ui.cc (right):

https://chromiumcodereview.appspot.com/12084065/diff/12/chrome/browser/ui/web...
chrome/browser/ui/webui/policy_ui.cc:276: void SendPolicyNames() const;
nit: newline

https://chromiumcodereview.appspot.com/12084065/diff/12/chrome/browser/ui/web...
chrome/browser/ui/webui/policy_ui.cc:280: void SendPolicyValues() const;
nit: newline

https://chromiumcodereview.appspot.com/12084065/diff/12/chrome/browser/ui/web...
File chrome/browser/ui/webui/policy_ui_browsertest.cc (right):

https://chromiumcodereview.appspot.com/12084065/diff/12/chrome/browser/ui/web...
chrome/browser/ui/webui/policy_ui_browsertest.cc:89: 
private:

[bartfab (slow), 2013-02-04 17:11:04]

https://codereview.chromium.org/12084065/diff/12/chrome/browser/resources/pol...
File chrome/browser/resources/policy.js (right):

https://codereview.chromium.org/12084065/diff/12/chrome/browser/resources/pol...
chrome/browser/resources/policy.js:94: this.unset = !value;
On 2013/02/04 16:05:16, Mattias Nissler wrote:
> Just to make sure: So integer policies with value 0 don't trigger this?

No, it's just misleading naming. |value| is a dict. |value.value| is the actual
value. So |Boolean(value)| will be |true| even if the policy has an integer
value of 0 or a Boolean value of |false|.

https://codereview.chromium.org/12084065/diff/12/chrome/browser/ui/webui/poli...
File chrome/browser/ui/webui/policy_ui.cc (right):

https://codereview.chromium.org/12084065/diff/12/chrome/browser/ui/webui/poli...
chrome/browser/ui/webui/policy_ui.cc:276: void SendPolicyNames() const;
On 2013/02/04 16:05:16, Mattias Nissler wrote:
> nit: newline

Done.

https://codereview.chromium.org/12084065/diff/12/chrome/browser/ui/webui/poli...
chrome/browser/ui/webui/policy_ui.cc:280: void SendPolicyValues() const;
On 2013/02/04 16:05:16, Mattias Nissler wrote:
> nit: newline

Done.

https://codereview.chromium.org/12084065/diff/12/chrome/browser/ui/webui/poli...
File chrome/browser/ui/webui/policy_ui_browsertest.cc (right):

https://codereview.chromium.org/12084065/diff/12/chrome/browser/ui/webui/poli...
chrome/browser/ui/webui/policy_ui_browsertest.cc:89: 
On 2013/02/04 16:05:16, Mattias Nissler wrote:
> private:

Done.

[commit-bot: I haz the power, 2013-02-04 17:37:54]

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

[commit-bot: I haz the power, 2013-02-04 21:39:41]

Failed to apply patch for chrome/browser/ui/webui/policy_ui.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/ui/webui/policy_ui.cc
  Hunk #12 FAILED at 486.
  1 out of 12 hunks FAILED -- saving rejects to file
chrome/browser/ui/webui/policy_ui.cc.rej

Patch:       chrome/browser/ui/webui/policy_ui.cc
Index: chrome/browser/ui/webui/policy_ui.cc
diff --git a/chrome/browser/ui/webui/policy_ui.cc
b/chrome/browser/ui/webui/policy_ui.cc
index
efa876d08a8448ef0190c0c80ec8a7929c0f4cc3..82533fa01fd8392feaafaf43feb94e37761a6b08
100644
--- a/chrome/browser/ui/webui/policy_ui.cc
+++ b/chrome/browser/ui/webui/policy_ui.cc
@@ -4,37 +4,42 @@
 
 #include "chrome/browser/ui/webui/policy_ui.h"
 
-#include <vector>
-
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
-#include "base/hash_tables.h"
-#include "base/stl_util.h"
+#include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
+#include "base/string16.h"
 #include "base/time.h"
-#include "base/utf_string_conversions.h"
+#include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud_policy_client.h"
+#include "chrome/browser/policy/cloud_policy_constants.h"
 #include "chrome/browser/policy/cloud_policy_core.h"
 #include "chrome/browser/policy/cloud_policy_refresh_scheduler.h"
 #include "chrome/browser/policy/cloud_policy_store.h"
 #include "chrome/browser/policy/cloud_policy_validator.h"
+#include "chrome/browser/policy/configuration_policy_handler_list.h"
+#include "chrome/browser/policy/device_local_account_policy_service.h"
 #include "chrome/browser/policy/message_util.h"
 #include "chrome/browser/policy/policy_error_map.h"
+#include "chrome/browser/policy/policy_map.h"
 #include "chrome/browser/policy/policy_service.h"
+#include "chrome/browser/policy/policy_types.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
-#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/common/pref_names.h"
 #include "chrome/common/time_format.h"
 #include "chrome/common/url_constants.h"
-#include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
+#include "content/public/browser/web_ui_message_handler.h"
+#include "google_apis/gaia/gaia_auth_util.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
+#include "policy/policy_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
@@ -49,13 +54,6 @@
 
 namespace em = enterprise_management;
 
-const char PolicyUIHandler::kLevel[] = "level";
-const char PolicyUIHandler::kName[] = "name";
-const char PolicyUIHandler::kScope[] = "scope";
-const char PolicyUIHandler::kSet[] = "set";
-const char PolicyUIHandler::kStatus[] = "status";
-const char PolicyUIHandler::kValue[] = "value";
-
 namespace {
 
 content::WebUIDataSource* CreatePolicyUIHTMLSource() {
@@ -63,125 +61,110 @@ content::WebUIDataSource* CreatePolicyUIHTMLSource() {
       content::WebUIDataSource::Create(chrome::kChromeUIPolicyHost);
 
   // Localized strings.
+  source->AddLocalizedString("title", IDS_POLICY_TITLE);
+  source->AddLocalizedString("filterPlaceholder",
+                             IDS_POLICY_FILTER_PLACEHOLDER);
+  source->AddLocalizedString("reloadPolicies", IDS_POLICY_RELOAD_POLICIES);
+  source->AddLocalizedString("status", IDS_POLICY_STATUS);
+  source->AddLocalizedString("statusDevice", IDS_POLICY_STATUS_DEVICE);
+  source->AddLocalizedString("statusUser", IDS_POLICY_STATUS_USER);
+  source->AddLocalizedString("labelDomain", IDS_POLICY_LABEL_DOMAIN);
+  source->AddLocalizedString("labelUsername", IDS_POLICY_LABEL_USERNAME);
+  source->AddLocalizedString("labelClientId", IDS_POLICY_LABEL_CLIENT_ID);
+  source->AddLocalizedString("labelTimeSinceLastRefresh",
+                             IDS_POLICY_LABEL_TIME_SINCE_LAST_REFRESH);
+  source->AddLocalizedString("labelRefreshInterval",
+                             IDS_POLICY_LABEL_REFRESH_INTERVAL);
+  source->AddLocalizedString("labelStatus", IDS_POLICY_LABEL_STATUS);
+  source->AddLocalizedString("showUnset", IDS_POLICY_SHOW_UNSET);
+  source->AddLocalizedString("noPoliciesSet", IDS_POLICY_NO_POLICIES_SET);
+  source->AddLocalizedString("headerScope", IDS_POLICY_HEADER_SCOPE);
+  source->AddLocalizedString("headerLevel", IDS_POLICY_HEADER_LEVEL);
+  source->AddLocalizedString("headerName", IDS_POLICY_HEADER_NAME);
+  source->AddLocalizedString("headerValue", IDS_POLICY_HEADER_VALUE);
+  source->AddLocalizedString("headerStatus", IDS_POLICY_HEADER_STATUS);
+  source->AddLocalizedString("showExpandedValue",
+                             IDS_POLICY_SHOW_EXPANDED_VALUE);
+  source->AddLocalizedString("hideExpandedValue",
+                             IDS_POLICY_HIDE_EXPANDED_VALUE);
+  source->AddLocalizedString("scopeUser", IDS_POLICY_SCOPE_USER);
+  source->AddLocalizedString("scopeDevice", IDS_POLICY_SCOPE_DEVICE);
+  source->AddLocalizedString("levelRecommended", IDS_POLICY_LEVEL_RECOMMENDED);
+  source->AddLocalizedString("levelMandatory", IDS_POLICY_LEVEL_MANDATORY);
+  source->AddLocalizedString("ok", IDS_POLICY_OK);
+  source->AddLocalizedString("unset", IDS_POLICY_UNSET);
+  source->AddLocalizedString("unknown", IDS_POLICY_UNKNOWN);
+
   source->SetUseJsonJSFormatV2();
-  source->AddLocalizedString("policyTitle", IDS_POLICY_TITLE);
-  source->AddLocalizedString("statusPaneTitle", IDS_POLICY_STATUS_TITLE);
-  source->AddLocalizedString("fetchPoliciesText", IDS_POLICY_FETCH);
-  source->AddLocalizedString("devicePoliciesBoxTitle",
-                             IDS_POLICY_DEVICE_POLICIES);
-  source->AddLocalizedString("userPoliciesBoxTitle", IDS_POLICY_USER_POLICIES);
-  source->AddLocalizedString("enrollmentDomainText",
-                             IDS_POLICY_ENROLLMENT_DOMAIN);
-  source->AddLocalizedString("clientIdText", IDS_POLICY_CLIENT_ID);
-  source->AddLocalizedString("usernameText", IDS_POLICY_USERNAME);
-  source->AddLocalizedString("timeSinceLastFetchText",
IDS_POLICY_LAST_FETCHED);
-  source->AddLocalizedString("fetchIntervalText", IDS_POLICY_FETCH_INTERVAL);
-  source->AddLocalizedString("serverStatusText", IDS_POLICY_SERVER_STATUS);
-  source->AddLocalizedString("showUnsentPoliciesText", IDS_POLICY_SHOW_UNSENT);
-  source->AddLocalizedString("filterPoliciesText", IDS_POLICY_FILTER);
-  source->AddLocalizedString("noPoliciesSet",IDS_POLICY_NO_POLICIES_SET);
-  source->AddLocalizedString("appliesToTableHeader", IDS_POLICY_APPLIES_TO);
-  source->AddLocalizedString("policyLevelTableHeader", IDS_POLICY_LEVEL);
-  source->AddLocalizedString("policyNameTableHeader", IDS_POLICY_ENTRY_NAME);
-  source->AddLocalizedString("policyValueTableHeader", IDS_POLICY_ENTRY_VALUE);
-  source->AddLocalizedString("policyStatusTableHeader",
-                             IDS_POLICY_ENTRY_STATUS);
-  source->AddLocalizedString("showMoreText", IDS_POLICY_SHOW_MORE);
-  source->AddLocalizedString("hideText", IDS_POLICY_HIDE);
   source->SetJsonPath("strings.js");
 
   // Add required resources.
   source->AddResourcePath("policy.css", IDR_POLICY_CSS);
   source->AddResourcePath("policy.js", IDR_POLICY_JS);
+  source->AddResourcePath("uber_utils.js", IDR_UBER_UTILS_JS);
   source->SetDefaultResource(IDR_POLICY_HTML);
 
   return source;
 }
 
-string16 GetPolicyScopeString(policy::PolicyScope scope) {
-  switch (scope) {
-    case policy::POLICY_SCOPE_USER:
-      return l10n_util::GetStringUTF16(IDS_POLICY_SCOPE_USER);
-    case policy::POLICY_SCOPE_MACHINE:
-      return l10n_util::GetStringUTF16(IDS_POLICY_SCOPE_MACHINE);
-  }
-  NOTREACHED();
-  return string16();
+void GetStatusFromCore(const policy::CloudPolicyCore* core,
+                       base::DictionaryValue* dict) {
+  const policy::CloudPolicyStore* store = core->store();
+  const policy::CloudPolicyClient* client = core->client();
+  const policy::CloudPolicyRefreshScheduler* refresh_scheduler =
+        core->refresh_scheduler();
+
+  bool no_error = store->status() == policy::CloudPolicyStore::STATUS_OK &&
+                  client && client->status() == policy::DM_STATUS_SUCCESS;
+  string16 status = store->status() == policy::CloudPolicyStore::STATUS_OK &&
+                    client && client->status() != policy::DM_STATUS_SUCCESS ?
+                        policy::FormatDeviceManagementStatus(client->status())
:
+                        policy::FormatStoreStatus(store->status(),
+                                                  store->validation_status());
+  const em::PolicyData* policy = store->policy();
+  std::string client_id = policy ? policy->device_id() : std::string();
+  std::string username = policy ? policy->username() : std::string();
+  base::TimeDelta refresh_interval =
+      base::TimeDelta::FromMilliseconds(refresh_scheduler ?
+          refresh_scheduler->refresh_delay() :
+          policy::CloudPolicyRefreshScheduler::kDefaultRefreshDelayMs);
+  base::Time last_refresh_time = refresh_scheduler ?
+      refresh_scheduler->last_refresh() : base::Time();
+
+  dict->SetBoolean("error", !no_error);
+  dict->SetString("status", status);
+  dict->SetString("clientId", client_id);
+  dict->SetString("username", username);
+  dict->SetString("refreshInterval",
+                  TimeFormat::TimeRemainingShort(refresh_interval));
+  dict->SetString("timeSinceLastRefresh", last_refresh_time.is_null() ?
+      l10n_util::GetStringUTF16(IDS_POLICY_NEVER_FETCHED) :
+      TimeFormat::TimeElapsed(base::Time::NowFromSystemTime() -
+                              last_refresh_time));
 }
 
-string16 GetPolicyLevelString(policy::PolicyLevel level) {
-  switch (level) {
-    case policy::POLICY_LEVEL_RECOMMENDED:
-      return l10n_util::GetStrin…
(message too large)

[commit-bot: I haz the power, 2013-02-05 09:37:20]

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

[commit-bot: I haz the power, 2013-02-05 11:51:55]

Change committed as 180684