Index: components/arc/arc_service_manager.h |
diff --git a/components/arc/arc_service_manager.h b/components/arc/arc_service_manager.h |
index 3dd7740e3719987868c8a711e8a4e93f1f37f54b..846114d76bee25cb6717b537f8d882a19f53c5e9 100644 |
--- a/components/arc/arc_service_manager.h |
+++ b/components/arc/arc_service_manager.h |
@@ -6,18 +6,21 @@ |
#define COMPONENTS_ARC_ARC_SERVICE_MANAGER_H_ |
#include <memory> |
+#include <string> |
#include <vector> |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
#include "base/task_runner.h" |
#include "base/threading/thread_checker.h" |
+#include "components/prefs/pref_member.h" |
#include "components/signin/core/account_id/account_id.h" |
namespace arc { |
class ArcBridgeService; |
class ArcService; |
+class ArcUserDataService; |
// Manages creation and destruction of services that communicate with the ARC |
// instance via the ArcBridgeService. |
@@ -39,7 +42,12 @@ class ArcServiceManager { |
static ArcServiceManager* Get(); |
// Called when the main profile is initialized after user logs in. |
- void OnPrimaryUserProfilePrepared(const AccountId& account_id); |
+ void OnPrimaryUserProfilePrepared(const AccountId& account_id, |
+ PrefService* pref_service, |
+ std::string pref_name); |
Luis Héctor Chávez
2016/05/20 15:03:58
nit: const std::string& pref_name
Daniel Erat
2016/05/20 17:41:05
"enabled_pref_name"? also document what the pref c
dspaid
2016/05/23 01:22:36
Done.
|
+ |
+ // Has the user enabled arc in their preferences. |
Daniel Erat
2016/05/20 17:41:05
nit: end with question mark
dspaid
2016/05/23 01:22:36
Done.
|
+ bool IsArcEnabled(); |
Luis Héctor Chávez
2016/05/20 15:03:58
bool IsArcEnabled() const;
dspaid
2016/05/23 01:22:36
Done.
|
// Called once the windowing system (ash) has been started. |
void OnAshStarted(); |
@@ -62,11 +70,14 @@ class ArcServiceManager { |
std::unique_ptr<ArcBridgeService> arc_bridge_service_; |
std::vector<std::unique_ptr<ArcService>> services_; |
+ std::unique_ptr<ArcUserDataService> arc_user_data_service_; |
// True once the window manager service got added, barring adding any more |
// of those since OnAshStarted() might be called multiple times. |
bool on_ash_started_called_ = false; |
+ std::unique_ptr<BooleanPrefMember> arc_enabled_pref_; |
Luis Héctor Chávez
2016/05/20 15:03:58
nit: Comment?
dspaid
2016/05/23 01:22:36
Done.
|
+ |
DISALLOW_COPY_AND_ASSIGN(ArcServiceManager); |
}; |