Added RefreshPolicies to PolicyService.

chrome/browser/ui/webui/policy_ui.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/policy_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud_policy_cache_base.h"
 #include "chrome/browser/policy/cloud_policy_data_store.h"
+#include "chrome/browser/policy/policy_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.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 "grit/browser_resources.h"
@@ skipping 46 matching lines @@
 
   return source;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // PolicyUIHandler
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-PolicyUIHandler::PolicyUIHandler() {
+PolicyUIHandler::PolicyUIHandler()
+    : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
   policy::ConfigurationPolicyReader* managed_platform =
       policy::ConfigurationPolicyReader::CreateManagedPlatformPolicyReader();
   policy::ConfigurationPolicyReader* managed_cloud =
       policy::ConfigurationPolicyReader::CreateManagedCloudPolicyReader();
   policy::ConfigurationPolicyReader* recommended_platform =
       policy::ConfigurationPolicyReader::
           CreateRecommendedPlatformPolicyReader();
   policy::ConfigurationPolicyReader* recommended_cloud =
       policy::ConfigurationPolicyReader::CreateRecommendedCloudPolicyReader();
   policy_status_.reset(new policy::PolicyStatus(managed_platform,
@@ skipping 12 matching lines @@
       "requestData",
       base::Bind(&PolicyUIHandler::HandleRequestData,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "fetchPolicy",
       base::Bind(&PolicyUIHandler::HandleFetchPolicy,
                  base::Unretained(this)));
 }
 
 void PolicyUIHandler::OnPolicyValuesChanged() {
-  SendDataToUI(true);
+  SendDataToUI(true, false);
 }
 
 void PolicyUIHandler::HandleRequestData(const ListValue* args) {
-  SendDataToUI(false);
+  SendDataToUI(false, false);
 }
 
 void PolicyUIHandler::HandleFetchPolicy(const ListValue* args) {
-  g_browser_process->browser_policy_connector()->RefreshPolicies();
+  // Fetching policy can potentially take a while due to cloud policy fetches.
+  // Use a WeakPtr to make sure the callback is invalidated if the tab is closed
+  // before the fetching completes.
+  g_browser_process->policy_service()->RefreshPolicies(
+      base::Bind(&PolicyUIHandler::SendDataToUI,
+                 weak_ptr_factory_.GetWeakPtr(),
+                 true, true));
 }
 
-void PolicyUIHandler::SendDataToUI(bool is_policy_update) {
+void PolicyUIHandler::SendDataToUI(bool is_policy_update,
+                                   bool is_refresh_done) {

[Mattias Nissler (ping if slow), 2012/04/27 09:03:27]

I feel it's odd to multiplex all the different signals we want to send through a
single javascript function call. Why don't we have separate functions for the
different notifications we send?

[Joao da Silva, 2012/04/27 11:24:12]

I've removed the booleans from SendDataToUI. The UI now determines whether
'returnData' comes from the first load or an update, and a separate call signals
that a refresh is done.

   DictionaryValue results;
   bool any_policies_set;
   ListValue* list = policy_status_->GetPolicyStatusList(&any_policies_set);
   results.Set("policies", list);
   results.SetBoolean("anyPoliciesSet", any_policies_set);
   DictionaryValue* dict = GetStatusData();
   results.Set("status", dict);
   results.SetBoolean("isPolicyUpdate", is_policy_update);
+  results.SetBoolean("isRefreshDone", is_refresh_done);
 
   web_ui()->CallJavascriptFunction("Policy.returnData", results);
 }
 
 DictionaryValue* PolicyUIHandler::GetStatusData() {
   DictionaryValue* results = new DictionaryValue();
   policy::BrowserPolicyConnector* connector =
       g_browser_process->browser_policy_connector();
 
   policy::CloudPolicySubsystem* device_subsystem =
@@ skipping 94 matching lines @@
 PolicyUI::PolicyUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new PolicyUIHandler);
 
   // Set up the chrome://policy/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   ChromeURLDataManager::AddDataSource(profile, CreatePolicyUIHTMLSource());
 }
 
 PolicyUI::~PolicyUI() {
 }