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

Unified Diff: chrome/browser/browser_process_impl.h

Issue 6979011: Move user cloud policy to BrowserProcess. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments by mnissler. Added unittest. Created 9 years, 7 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/browser_process_impl.h
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index 577d4ba71b53b914a1a262eae239179dd4daf77b..09cd120cac8aeea378f38198b077014aa9553acf 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -36,6 +36,13 @@ class NotificationService;
class PluginDataRemover;
class TabCloseableStateWatcher;
+namespace policy{
+class BrowserPolicyConnector;
+class UserPolicyConnector;
+class ConfigurationPolicyProvider;
+class CombiningCloudPolicyProvider;
+};
+
// Real implementation of BrowserProcess that creates and returns the services.
class BrowserProcessImpl : public BrowserProcess,
public base::NonThreadSafe,
@@ -75,6 +82,10 @@ class BrowserProcessImpl : public BrowserProcess,
virtual ExtensionEventRouterForwarder* extension_event_router_forwarder();
virtual NotificationUIManager* notification_ui_manager();
virtual policy::BrowserPolicyConnector* browser_policy_connector();
+ virtual policy::UserPolicyConnector* user_policy_connector();
+ virtual policy::ConfigurationPolicyProvider* managed_cloud_policy_provider();
+ virtual policy::ConfigurationPolicyProvider*
+ recommended_cloud_policy_provider();
virtual IconManager* icon_manager();
virtual ThumbnailGenerator* GetThumbnailGenerator();
virtual AutomationProviderList* InitAutomationProviderList();
@@ -222,6 +233,17 @@ class BrowserProcessImpl : public BrowserProcess,
bool created_browser_policy_connector_;
scoped_ptr<policy::BrowserPolicyConnector> browser_policy_connector_;
+ bool created_user_policy_connector_;
+ scoped_ptr<policy::UserPolicyConnector> user_policy_connector_;
+
+ bool created_managed_cloud_policy_provider_;
+ scoped_ptr<policy::CombiningCloudPolicyProvider>
+ managed_cloud_policy_provider_;
+
+ bool created_recommended_cloud_policy_provider_;
+ scoped_ptr<policy::CombiningCloudPolicyProvider>
+ recommended_cloud_policy_provider_;
+
scoped_refptr<printing::PrintPreviewTabController>
print_preview_tab_controller_;

Powered by Google App Engine
This is Rietveld 408576698