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

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

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: Store intent filers in LocalActivityResolver. Created 4 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 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 #include "components/arc/arc_service_manager.h" 5 #include "components/arc/arc_service_manager.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "base/sequenced_task_runner.h" 8 #include "base/sequenced_task_runner.h"
9 #include "base/threading/thread_task_runner_handle.h" 9 #include "base/threading/thread_task_runner_handle.h"
10 #include "components/arc/arc_bridge_bootstrap.h" 10 #include "components/arc/arc_bridge_bootstrap.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 ArcBridgeBootstrap::Create())); 53 ArcBridgeBootstrap::Create()));
54 } 54 }
55 55
56 AddService(base::WrapUnique(new ArcAudioBridge(arc_bridge_service()))); 56 AddService(base::WrapUnique(new ArcAudioBridge(arc_bridge_service())));
57 AddService(base::WrapUnique(new ArcBluetoothBridge(arc_bridge_service()))); 57 AddService(base::WrapUnique(new ArcBluetoothBridge(arc_bridge_service())));
58 AddService(base::WrapUnique(new ArcClipboardBridge(arc_bridge_service()))); 58 AddService(base::WrapUnique(new ArcClipboardBridge(arc_bridge_service())));
59 AddService( 59 AddService(
60 base::WrapUnique(new ArcCrashCollectorBridge(arc_bridge_service()))); 60 base::WrapUnique(new ArcCrashCollectorBridge(arc_bridge_service())));
61 AddService(base::WrapUnique(new ArcImeService(arc_bridge_service()))); 61 AddService(base::WrapUnique(new ArcImeService(arc_bridge_service())));
62 icon_loader_ = new ActivityIconLoader; 62 icon_loader_ = new ActivityIconLoader;
63 AddService(base::WrapUnique( 63 activity_resolver_ = new LocalActivityResolver;
Yusuke Sato 2016/06/17 21:51:15 This code is fine, but it conflicts with a recent
zentaro 2016/06/17 23:37:35 Done.
64 new ArcIntentHelperBridge(arc_bridge_service(), icon_loader_))); 64 AddService(base::WrapUnique(new ArcIntentHelperBridge(
65 arc_bridge_service(), icon_loader_, activity_resolver_)));
65 AddService(base::WrapUnique(new ArcMetricsService(arc_bridge_service()))); 66 AddService(base::WrapUnique(new ArcMetricsService(arc_bridge_service())));
66 AddService(base::WrapUnique(new ArcNetHostImpl(arc_bridge_service()))); 67 AddService(base::WrapUnique(new ArcNetHostImpl(arc_bridge_service())));
67 AddService(base::WrapUnique(new ArcObbMounterBridge(arc_bridge_service()))); 68 AddService(base::WrapUnique(new ArcObbMounterBridge(arc_bridge_service())));
68 AddService(base::WrapUnique(new ArcPowerBridge(arc_bridge_service()))); 69 AddService(base::WrapUnique(new ArcPowerBridge(arc_bridge_service())));
69 AddService(base::WrapUnique(new ArcStorageManager(arc_bridge_service()))); 70 AddService(base::WrapUnique(new ArcStorageManager(arc_bridge_service())));
70 } 71 }
71 72
72 ArcServiceManager::~ArcServiceManager() { 73 ArcServiceManager::~ArcServiceManager() {
73 DCHECK(thread_checker_.CalledOnValidThread()); 74 DCHECK(thread_checker_.CalledOnValidThread());
74 DCHECK(g_arc_service_manager == this); 75 DCHECK(g_arc_service_manager == this);
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 if (on_ash_started_called_) 115 if (on_ash_started_called_)
115 return; 116 return;
116 117
117 on_ash_started_called_ = true; 118 on_ash_started_called_ = true;
118 AddService( 119 AddService(
119 base::WrapUnique(new ArcWindowManagerBridge(arc_bridge_service()))); 120 base::WrapUnique(new ArcWindowManagerBridge(arc_bridge_service())));
120 } 121 }
121 122
122 void ArcServiceManager::Shutdown() { 123 void ArcServiceManager::Shutdown() {
123 icon_loader_ = nullptr; 124 icon_loader_ = nullptr;
125 activity_resolver_ = nullptr;
124 services_.clear(); 126 services_.clear();
125 } 127 }
126 128
127 //static 129 //static
128 void ArcServiceManager::SetArcBridgeServiceForTesting( 130 void ArcServiceManager::SetArcBridgeServiceForTesting(
129 std::unique_ptr<ArcBridgeService> arc_bridge_service) { 131 std::unique_ptr<ArcBridgeService> arc_bridge_service) {
130 if (g_arc_bridge_service_for_testing) { 132 if (g_arc_bridge_service_for_testing) {
131 delete g_arc_bridge_service_for_testing; 133 delete g_arc_bridge_service_for_testing;
132 } 134 }
133 g_arc_bridge_service_for_testing = arc_bridge_service.release(); 135 g_arc_bridge_service_for_testing = arc_bridge_service.release();
134 } 136 }
135 137
136 } // namespace arc 138 } // namespace arc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698