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

Side by Side Diff: components/arc/arc_service_manager.h

Issue 2078683002: Add handler and mojo interface to accept android intent filters. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add code accidentally removed. Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef COMPONENTS_ARC_ARC_SERVICE_MANAGER_H_ 5 #ifndef COMPONENTS_ARC_ARC_SERVICE_MANAGER_H_
6 #define COMPONENTS_ARC_ARC_SERVICE_MANAGER_H_ 6 #define COMPONENTS_ARC_ARC_SERVICE_MANAGER_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/task_runner.h" 13 #include "base/task_runner.h"
14 #include "base/threading/thread_checker.h" 14 #include "base/threading/thread_checker.h"
15 #include "components/arc/intent_helper/activity_icon_loader.h" 15 #include "components/arc/intent_helper/activity_icon_loader.h"
16 #include "components/arc/intent_helper/local_activity_resolver.h"
16 #include "components/prefs/pref_member.h" 17 #include "components/prefs/pref_member.h"
17 #include "components/signin/core/account_id/account_id.h" 18 #include "components/signin/core/account_id/account_id.h"
18 19
19 namespace arc { 20 namespace arc {
20 21
21 class ArcBridgeService; 22 class ArcBridgeService;
22 class ArcService; 23 class ArcService;
23 24
24 // Manages creation and destruction of services that communicate with the ARC 25 // Manages creation and destruction of services that communicate with the ARC
25 // instance via the ArcBridgeService. 26 // instance via the ArcBridgeService.
(...skipping 30 matching lines...) Expand all
56 } 57 }
57 58
58 // Set ArcBridgeService instance for testing. Call before ArcServiceManager 59 // Set ArcBridgeService instance for testing. Call before ArcServiceManager
59 // creation. ArcServiceManager owns |arc_bridge_service|. 60 // creation. ArcServiceManager owns |arc_bridge_service|.
60 static void SetArcBridgeServiceForTesting( 61 static void SetArcBridgeServiceForTesting(
61 std::unique_ptr<ArcBridgeService> arc_bridge_service); 62 std::unique_ptr<ArcBridgeService> arc_bridge_service);
62 63
63 // Returns the icon loader owned by ArcServiceManager and shared by services. 64 // Returns the icon loader owned by ArcServiceManager and shared by services.
64 scoped_refptr<ActivityIconLoader> icon_loader() { return icon_loader_; } 65 scoped_refptr<ActivityIconLoader> icon_loader() { return icon_loader_; }
65 66
67 // Returns the activity resolver owned by ArcServiceManager.
68 scoped_refptr<LocalActivityResolver> activity_resolver() {
69 return activity_resolver_;
70 }
71
66 private: 72 private:
67 base::ThreadChecker thread_checker_; 73 base::ThreadChecker thread_checker_;
68 scoped_refptr<base::TaskRunner> blocking_task_runner_; 74 scoped_refptr<base::TaskRunner> blocking_task_runner_;
69 75
70 std::unique_ptr<ArcBridgeService> arc_bridge_service_; 76 std::unique_ptr<ArcBridgeService> arc_bridge_service_;
71 std::vector<std::unique_ptr<ArcService>> services_; 77 std::vector<std::unique_ptr<ArcService>> services_;
72 scoped_refptr<ActivityIconLoader> icon_loader_; 78 scoped_refptr<ActivityIconLoader> icon_loader_;
79 scoped_refptr<LocalActivityResolver> activity_resolver_;
73 80
74 // True once the window manager service got added, barring adding any more 81 // True once the window manager service got added, barring adding any more
75 // of those since OnAshStarted() might be called multiple times. 82 // of those since OnAshStarted() might be called multiple times.
76 bool on_ash_started_called_ = false; 83 bool on_ash_started_called_ = false;
77 84
78 DISALLOW_COPY_AND_ASSIGN(ArcServiceManager); 85 DISALLOW_COPY_AND_ASSIGN(ArcServiceManager);
79 }; 86 };
80 87
81 } // namespace arc 88 } // namespace arc
82 89
83 #endif // COMPONENTS_ARC_ARC_SERVICE_MANAGER_H_ 90 #endif // COMPONENTS_ARC_ARC_SERVICE_MANAGER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/arc/arc_service_launcher.cc ('k') | components/arc/arc_service_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698