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

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

Issue 2581953002: Introduce ArcServiceManager::OnShutdown(). (Closed)
Patch Set: Address comments. Created 4 years 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
« no previous file with comments | « components/arc/arc_service_manager.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <utility> 7 #include <utility>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 } 76 }
77 77
78 // static 78 // static
79 ArcServiceManager* ArcServiceManager::Get() { 79 ArcServiceManager* ArcServiceManager::Get() {
80 if (!g_arc_service_manager) 80 if (!g_arc_service_manager)
81 return nullptr; 81 return nullptr;
82 DCHECK(g_arc_service_manager->thread_checker_.CalledOnValidThread()); 82 DCHECK(g_arc_service_manager->thread_checker_.CalledOnValidThread());
83 return g_arc_service_manager; 83 return g_arc_service_manager;
84 } 84 }
85 85
86 // static
87 bool ArcServiceManager::IsInitialized() {
88 if (!g_arc_service_manager)
89 return false;
90 DCHECK(g_arc_service_manager->thread_checker_.CalledOnValidThread());
91 return true;
92 }
93
94 ArcBridgeService* ArcServiceManager::arc_bridge_service() { 86 ArcBridgeService* ArcServiceManager::arc_bridge_service() {
95 DCHECK(thread_checker_.CalledOnValidThread()); 87 DCHECK(thread_checker_.CalledOnValidThread());
96 return arc_bridge_service_.get(); 88 return arc_bridge_service_.get();
97 } 89 }
98 90
99 void ArcServiceManager::AddService(std::unique_ptr<ArcService> service) { 91 void ArcServiceManager::AddService(std::unique_ptr<ArcService> service) {
100 DCHECK(thread_checker_.CalledOnValidThread()); 92 DCHECK(thread_checker_.CalledOnValidThread());
101 services_.emplace_back(std::move(service)); 93 services_.emplace_back(std::move(service));
102 } 94 }
103 95
104 void ArcServiceManager::AddObserver(Observer* observer) { 96 void ArcServiceManager::AddObserver(Observer* observer) {
105 DCHECK(thread_checker_.CalledOnValidThread()); 97 DCHECK(thread_checker_.CalledOnValidThread());
106 observer_list_.AddObserver(observer); 98 observer_list_.AddObserver(observer);
107 } 99 }
108 100
109 void ArcServiceManager::RemoveObserver(Observer* observer) { 101 void ArcServiceManager::RemoveObserver(Observer* observer) {
110 DCHECK(thread_checker_.CalledOnValidThread()); 102 DCHECK(thread_checker_.CalledOnValidThread());
111 observer_list_.RemoveObserver(observer); 103 observer_list_.RemoveObserver(observer);
112 } 104 }
113 105
114 void ArcServiceManager::Shutdown() { 106 void ArcServiceManager::Shutdown() {
115 DCHECK(thread_checker_.CalledOnValidThread()); 107 DCHECK(thread_checker_.CalledOnValidThread());
108
109 // Before actual shutdown, notify observers for clean up.
110 for (auto& observer : observer_list_)
111 observer.OnArcShutdown();
112
116 icon_loader_ = nullptr; 113 icon_loader_ = nullptr;
117 activity_resolver_ = nullptr; 114 activity_resolver_ = nullptr;
118 services_.clear(); 115 services_.clear();
119 arc_bridge_service_->OnShutdown(); 116 arc_bridge_service_->OnShutdown();
120 } 117 }
121 118
122 // static 119 // static
123 void ArcServiceManager::SetArcBridgeServiceForTesting( 120 void ArcServiceManager::SetArcBridgeServiceForTesting(
124 std::unique_ptr<ArcBridgeService> arc_bridge_service) { 121 std::unique_ptr<ArcBridgeService> arc_bridge_service) {
125 if (g_arc_bridge_service_for_testing) 122 if (g_arc_bridge_service_for_testing)
126 delete g_arc_bridge_service_for_testing; 123 delete g_arc_bridge_service_for_testing;
127 g_arc_bridge_service_for_testing = arc_bridge_service.release(); 124 g_arc_bridge_service_for_testing = arc_bridge_service.release();
128 } 125 }
129 126
130 } // namespace arc 127 } // namespace arc
OLDNEW
« no previous file with comments | « components/arc/arc_service_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698