Index: components/arc/arc_service_manager.h |
diff --git a/components/arc/arc_service_manager.h b/components/arc/arc_service_manager.h |
index 81a4ea9e98b2e715e289b112d3cae2660d72cbd6..bba756e46654ffc2ca6babdc4579cdf19551293f 100644 |
--- a/components/arc/arc_service_manager.h |
+++ b/components/arc/arc_service_manager.h |
@@ -19,6 +19,7 @@ |
namespace arc { |
class ArcBridgeService; |
+class ArcFileSystemService; |
class ArcIntentHelperObserver; |
class ArcService; |
@@ -31,10 +32,10 @@ class ArcServiceManager { |
// Called when ArcServiceManager is being shut down. Observer |
// implementation should clean up ARC related stuff here. One of the |
// typical use cases is calling ArcServiceManager::RemoveObserver(). |
- virtual void OnArcShutdown() = 0; |
+ virtual void OnArcShutdown() {} |
Luis Héctor Chávez
2017/01/10 18:51:35
nit: can you leave them as they were before? we wa
Shuhei Takahashi
2017/01/11 15:20:43
Done.
|
// Called when intent filters are added or removed. |
- virtual void OnIntentFiltersUpdated() = 0; |
+ virtual void OnIntentFiltersUpdated() {} |
protected: |
virtual ~Observer() = default; |
@@ -73,11 +74,19 @@ class ArcServiceManager { |
return activity_resolver_; |
} |
- // Returns the IntentHelperObserver instance owned by ArcServiceManager. |
+ // Returns the ArcIntentHelperObserver instance owned by ArcServiceManager. |
ArcIntentHelperObserver* intent_helper_observer() { |
return intent_helper_observer_.get(); |
} |
+ // TODO(crbug.com/672840): Implement a generic getter to avoid boilerplates. |
+ void set_file_system_service(ArcFileSystemService* file_system_service) { |
+ file_system_service_ = file_system_service; |
+ } |
+ ArcFileSystemService* file_system_service() const { |
+ return file_system_service_; |
+ } |
+ |
private: |
class IntentHelperObserverImpl; // implemented in arc_service_manager.cc. |
@@ -92,6 +101,8 @@ class ArcServiceManager { |
scoped_refptr<ActivityIconLoader> icon_loader_; |
scoped_refptr<LocalActivityResolver> activity_resolver_; |
+ ArcFileSystemService* file_system_service_; // Owned by |services_|. |
+ |
base::ObserverList<Observer> observer_list_; |
DISALLOW_COPY_AND_ASSIGN(ArcServiceManager); |