Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1643)

Unified Diff: chrome/browser/chromeos/platform_keys/platform_keys_service_factory.cc

Issue 1150373002: platformKeys: Add policy and corporate key tagging. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@key_perm
Patch Set: Rebased. Created 5 years, 6 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
Index: chrome/browser/chromeos/platform_keys/platform_keys_service_factory.cc
diff --git a/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.cc b/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.cc
index f72a586b3c4075cbef8eaf66106f8d012bd74e1b..2f529b6f04ada71e1f1de4272a147a559ff709a5 100644
--- a/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.cc
+++ b/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.cc
@@ -16,6 +16,7 @@
#include "chrome/browser/policy/profile_policy_connector.h"
#include "chrome/browser/policy/profile_policy_connector_factory.h"
#include "chrome/browser/profiles/incognito_helpers.h"
+#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/platform_keys_certificate_selector_chromeos.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "extensions/browser/extension_registry.h"
@@ -103,8 +104,12 @@ KeyedService* PlatformKeysServiceFactory::BuildServiceInstanceFor(
policy::ProfilePolicyConnector* const policy_connector =
policy::ProfilePolicyConnectorFactory::GetForBrowserContext(context);
- PlatformKeysService* const service =
- new PlatformKeysService(policy_connector->IsManaged(), context, store);
+
+ Profile* const profile = Profile::FromBrowserContext(context);
+
+ PlatformKeysService* const service = new PlatformKeysService(
+ policy_connector->IsManaged(), profile->GetPrefs(),
+ policy_connector->policy_service(), context, store);
service->SetSelectDelegate(make_scoped_ptr(new DefaultSelectDelegate()));
return service;

Powered by Google App Engine
This is Rietveld 408576698