Commit 483c224a authored by binjin's avatar binjin Committed by Commit bot

Allow user to manually fetch remote commands

Currently remote commands fetch depends solely on invalidation, evaluate and
possibly remove this after invalidation service is landed and tested.

BUG=480982

Committed: https://crrev.com/610f47342c8d725e239513ac17727a176d161495
Cr-Commit-Position: refs/heads/master@{#327765}

Review URL: https://codereview.chromium.org/1106193003

Cr-Commit-Position: refs/heads/master@{#330082}
parent 359a8b74
......@@ -36,6 +36,7 @@
#include "components/policy/core/common/policy_namespace.h"
#include "components/policy/core/common/policy_service.h"
#include "components/policy/core/common/policy_types.h"
#include "components/policy/core/common/remote_commands/remote_commands_service.h"
#include "components/policy/core/common/schema.h"
#include "components/policy/core/common/schema_map.h"
#include "components/policy/core/common/schema_registry.h"
......@@ -52,6 +53,7 @@
#include "ui/base/l10n/time_format.h"
#if defined(OS_CHROMEOS)
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
#include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
......@@ -807,9 +809,22 @@ void PolicyUIHandler::HandleInitialized(const base::ListValue* args) {
}
void PolicyUIHandler::HandleReloadPolicies(const base::ListValue* args) {
GetPolicyService()->RefreshPolicies(
base::Bind(&PolicyUIHandler::OnRefreshPoliciesDone,
weak_factory_.GetWeakPtr()));
#if defined(OS_CHROMEOS)
// Allow user to manually fetch remote commands, in case invalidation
// service is not working properly.
// TODO(binjin): evaluate and possibly remove this after invalidation
// service is landed and tested. http://crbug.com/480982
policy::BrowserPolicyConnectorChromeOS* connector =
g_browser_process->platform_part()->browser_policy_connector_chromeos();
policy::RemoteCommandsService* remote_commands_service =
connector->GetDeviceCloudPolicyManager()
->core()
->remote_commands_service();
if (remote_commands_service)
remote_commands_service->FetchRemoteCommands();
#endif
GetPolicyService()->RefreshPolicies(base::Bind(
&PolicyUIHandler::OnRefreshPoliciesDone, weak_factory_.GetWeakPtr()));
}
void PolicyUIHandler::OnRefreshPoliciesDone() const {
......
......@@ -30,7 +30,7 @@ RemoteCommandsService::~RemoteCommandsService() {
}
bool RemoteCommandsService::FetchRemoteCommands() {
if (!client_->is_registered())
if (!client_ || !client_->is_registered())
return false;
if (command_fetch_in_progress_) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment