chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc - Issue 19733003: Implement cloud policy invalidations using the invalidation service framework.

Unified Diff: chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

Issue 19733003: Implement cloud policy invalidations using the invalidation service framework. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc ('K') | « chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc ('k') | chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc » ('j') | chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

index 0cb76ccdebc3105c0be8a5d6d0d958dc745f2676..66ee4a53a870cfc7d095b7e2129a86a9d82dcfab 100644

--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

@@ -14,6 +14,7 @@

#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"

#include "chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h"

#include "chrome/browser/chromeos/profiles/profile_helper.h"

+#include "chrome/browser/invalidation/invalidation_service_factory.h"

#include "chrome/browser/policy/browser_policy_connector.h"

#include "chrome/browser/policy/cloud/device_management_service.h"

#include "chrome/browser/policy/cloud/resource_cache.h"

@@ -68,7 +69,9 @@ scoped_ptr<UserCloudPolicyManagerChromeOS>

UserCloudPolicyManagerFactoryChromeOS::UserCloudPolicyManagerFactoryChromeOS()

: BrowserContextKeyedBaseFactory(

"UserCloudPolicyManagerChromeOS",

- BrowserContextDependencyManager::GetInstance()) {}

+ BrowserContextDependencyManager::GetInstance()) {

+ DependsOn(invalidation::InvalidationServiceFactory::GetInstance());

UserCloudPolicyManagerFactoryChromeOS::

~UserCloudPolicyManagerFactoryChromeOS() {}

@@ -143,7 +146,8 @@ scoped_ptr<UserCloudPolicyManagerChromeOS>

if (command_line->HasSwitch(switches::kEnableComponentCloudPolicy))

resource_cache.reset(new ResourceCache(resource_cache_dir));

scoped_ptr<UserCloudPolicyManagerChromeOS> manager(

- new UserCloudPolicyManagerChromeOS(store.Pass(),

+ new UserCloudPolicyManagerChromeOS(profile,

Joao da Silva 2013/07/23 20:44:47 Instead of passing in the Profile, pass in the rea

Steve Condie 2013/07/24 01:42:04 Done.

+ store.Pass(),

resource_cache.Pass(),

wait_for_initial_policy));

manager->Init();