| OLD | NEW |
| 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_bridge_service.h" | 5 #include "components/arc/arc_bridge_service_impl.h" |
| 6 | 6 |
| 7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
| 8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
| 9 #include "base/prefs/pref_registry_simple.h" | 9 #include "base/prefs/pref_registry_simple.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| 11 #include "base/task_runner_util.h" | 11 #include "base/task_runner_util.h" |
| 12 #include "base/thread_task_runner_handle.h" | 12 #include "base/thread_task_runner_handle.h" |
| 13 #include "chromeos/dbus/dbus_method_call_status.h" | 13 #include "chromeos/dbus/dbus_method_call_status.h" |
| 14 #include "chromeos/dbus/dbus_thread_manager.h" | 14 #include "chromeos/dbus/dbus_thread_manager.h" |
| 15 #include "chromeos/dbus/session_manager_client.h" | 15 #include "chromeos/dbus/session_manager_client.h" |
| 16 #include "components/arc/common/arc_host_messages.h" | 16 #include "components/arc/common/arc_host_messages.h" |
| 17 #include "components/arc/common/arc_instance_messages.h" | 17 #include "components/arc/common/arc_instance_messages.h" |
| 18 #include "ipc/ipc_channel.h" | 18 #include "ipc/ipc_channel.h" |
| 19 | 19 |
| 20 namespace arc { | 20 namespace arc { |
| 21 | 21 |
| 22 namespace { | 22 namespace { |
| 23 | 23 |
| 24 const base::FilePath::CharType kArcBridgeSocketPath[] = | 24 const base::FilePath::CharType kArcBridgeSocketPath[] = |
| 25 FILE_PATH_LITERAL("/home/chronos/ArcBridge/bridge.sock"); | 25 FILE_PATH_LITERAL("/home/chronos/ArcBridge/bridge.sock"); |
| 26 | 26 |
| 27 // Weak pointer. This class is owned by ChromeBrowserMainPartsChromeos. | |
| 28 ArcBridgeService* g_arc_bridge_service = nullptr; | |
| 29 | |
| 30 } // namespace | 27 } // namespace |
| 31 | 28 |
| 32 ArcBridgeService::ArcBridgeService( | 29 ArcBridgeServiceImpl::ArcBridgeServiceImpl( |
| 33 const scoped_refptr<base::SingleThreadTaskRunner>& ipc_task_runner, | 30 const scoped_refptr<base::SingleThreadTaskRunner>& ipc_task_runner, |
| 34 const scoped_refptr<base::SequencedTaskRunner>& file_task_runner) | 31 const scoped_refptr<base::SequencedTaskRunner>& file_task_runner) |
| 35 : origin_task_runner_(base::ThreadTaskRunnerHandle::Get()), | 32 : ipc_task_runner_(ipc_task_runner), |
| 36 ipc_task_runner_(ipc_task_runner), | |
| 37 file_task_runner_(file_task_runner), | 33 file_task_runner_(file_task_runner), |
| 38 session_started_(false), | 34 session_started_(false), |
| 39 available_(false), | |
| 40 state_(State::STOPPED), | |
| 41 weak_factory_(this) { | 35 weak_factory_(this) { |
| 42 DCHECK(!g_arc_bridge_service); | |
| 43 g_arc_bridge_service = this; | |
| 44 } | 36 } |
| 45 | 37 |
| 46 ArcBridgeService::~ArcBridgeService() { | 38 ArcBridgeServiceImpl::~ArcBridgeServiceImpl() { |
| 47 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); | |
| 48 DCHECK(state_ == State::STOPPING || state_ == State::STOPPED); | |
| 49 DCHECK(g_arc_bridge_service); | |
| 50 g_arc_bridge_service = nullptr; | |
| 51 } | 39 } |
| 52 | 40 |
| 53 // static | 41 void ArcBridgeServiceImpl::DetectAvailability() { |
| 54 ArcBridgeService* ArcBridgeService::Get() { | |
| 55 DCHECK(g_arc_bridge_service); | |
| 56 DCHECK(g_arc_bridge_service->origin_task_runner_->RunsTasksOnCurrentThread()); | |
| 57 return g_arc_bridge_service; | |
| 58 } | |
| 59 | |
| 60 void ArcBridgeService::DetectAvailability() { | |
| 61 chromeos::SessionManagerClient* session_manager_client = | 42 chromeos::SessionManagerClient* session_manager_client = |
| 62 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(); | 43 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(); |
| 63 session_manager_client->CheckArcAvailability(base::Bind( | 44 session_manager_client->CheckArcAvailability(base::Bind( |
| 64 &ArcBridgeService::OnArcAvailable, weak_factory_.GetWeakPtr())); | 45 &ArcBridgeServiceImpl::OnArcAvailable, weak_factory_.GetWeakPtr())); |
| 65 } | 46 } |
| 66 | 47 |
| 67 void ArcBridgeService::HandleStartup() { | 48 void ArcBridgeServiceImpl::HandleStartup() { |
| 68 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); | 49 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); |
| 69 session_started_ = true; | 50 session_started_ = true; |
| 70 PrerequisitesChanged(); | 51 PrerequisitesChanged(); |
| 71 } | 52 } |
| 72 | 53 |
| 73 void ArcBridgeService::Shutdown() { | 54 void ArcBridgeServiceImpl::Shutdown() { |
| 74 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); | 55 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); |
| 75 session_started_ = false; | 56 session_started_ = false; |
| 76 PrerequisitesChanged(); | 57 PrerequisitesChanged(); |
| 77 } | 58 } |
| 78 | 59 |
| 79 void ArcBridgeService::AddObserver(Observer* observer) { | 60 void ArcBridgeServiceImpl::PrerequisitesChanged() { |
| 80 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); | 61 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); |
| 81 observer_list_.AddObserver(observer); | 62 if (state() == State::STOPPED) { |
| 82 } | 63 if (!available() || !session_started_) |
| 83 | |
| 84 void ArcBridgeService::RemoveObserver(Observer* observer) { | |
| 85 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); | |
| 86 observer_list_.RemoveObserver(observer); | |
| 87 } | |
| 88 | |
| 89 void ArcBridgeService::PrerequisitesChanged() { | |
| 90 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); | |
| 91 if (state_ == State::STOPPED) { | |
| 92 if (!available_ || !session_started_) | |
| 93 return; | 64 return; |
| 94 SocketConnect(base::FilePath(kArcBridgeSocketPath)); | 65 SocketConnect(base::FilePath(kArcBridgeSocketPath)); |
| 95 } else { | 66 } else { |
| 96 if (available_ && session_started_) | 67 if (available() && session_started_) |
| 97 return; | 68 return; |
| 98 StopInstance(); | 69 StopInstance(); |
| 99 } | 70 } |
| 100 } | 71 } |
| 101 | 72 |
| 102 void ArcBridgeService::StopInstance() { | 73 void ArcBridgeServiceImpl::StopInstance() { |
| 103 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); | 74 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); |
| 104 if (state_ == State::STOPPED || state_ == State::STOPPING) { | 75 if (state() == State::STOPPED || state() == State::STOPPING) { |
| 105 VLOG(1) << "StopInstance() called when ARC is not running"; | 76 VLOG(1) << "StopInstance() called when ARC is not running"; |
| 106 return; | 77 return; |
| 107 } | 78 } |
| 108 if (state_ == State::CONNECTED || state_ == State::CONNECTING) { | 79 if (state() == State::CONNECTED || state() == State::CONNECTING) { |
| 109 // This was stopped before the D-Bus command to start the instance. Just | 80 // This was stopped before the D-Bus command to start the instance. Just |
| 110 // close the socket (if it was opened). | 81 // close the socket (if it was opened). |
| 111 if (state_ == State::CONNECTED) { | 82 if (state() == State::CONNECTED) { |
| 112 ipc_channel_.reset(); | 83 ipc_channel_.reset(); |
| 113 } | 84 } |
| 114 SetState(State::STOPPED); | 85 SetState(State::STOPPED); |
| 115 return; | 86 return; |
| 116 } | 87 } |
| 117 | 88 |
| 118 SetState(State::STOPPING); | 89 SetState(State::STOPPING); |
| 119 chromeos::SessionManagerClient* session_manager_client = | 90 chromeos::SessionManagerClient* session_manager_client = |
| 120 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(); | 91 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(); |
| 121 session_manager_client->StopArcInstance(base::Bind( | 92 session_manager_client->StopArcInstance(base::Bind( |
| 122 &ArcBridgeService::OnInstanceStopped, weak_factory_.GetWeakPtr())); | 93 &ArcBridgeServiceImpl::OnInstanceStopped, weak_factory_.GetWeakPtr())); |
| 123 } | 94 } |
| 124 | 95 |
| 125 bool ArcBridgeService::RegisterInputDevice(const std::string& name, | 96 bool ArcBridgeServiceImpl::RegisterInputDevice(const std::string& name, |
| 126 const std::string& device_type, | 97 const std::string& device_type, |
| 127 base::ScopedFD fd) { | 98 base::ScopedFD fd) { |
| 128 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); | 99 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); |
| 129 if (state_ != State::READY) { | 100 if (state() != State::READY) { |
| 130 LOG(ERROR) << "Called RegisterInputDevice when the service is not ready"; | 101 LOG(ERROR) << "Called RegisterInputDevice when the service is not ready"; |
| 131 return false; | 102 return false; |
| 132 } | 103 } |
| 133 return ipc_channel_->Send(new ArcInstanceMsg_RegisterInputDevice( | 104 return ipc_channel_->Send(new ArcInstanceMsg_RegisterInputDevice( |
| 134 name, device_type, base::FileDescriptor(fd.Pass()))); | 105 name, device_type, base::FileDescriptor(fd.Pass()))); |
| 135 } | 106 } |
| 136 | 107 |
| 137 void ArcBridgeService::SocketConnect(const base::FilePath& socket_path) { | 108 bool ArcBridgeServiceImpl::RefreshApps() { |
| 138 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); | 109 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); |
| 139 if (state_ != State::STOPPED) { | 110 if (state() != State::READY) { |
| 111 LOG(ERROR) << "Called RefreshApps when the service is not ready"; |
| 112 return false; |
| 113 } |
| 114 return ipc_channel_->Send(new ArcInstanceMsg_RefreshApps()); |
| 115 } |
| 116 |
| 117 bool ArcBridgeServiceImpl::LaunchApp(const std::string& package, |
| 118 const std::string& activity) { |
| 119 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); |
| 120 if (state() != State::READY) { |
| 121 LOG(ERROR) << "Called LaunchApp when the service is not ready"; |
| 122 return false; |
| 123 } |
| 124 |
| 125 return ipc_channel_->Send(new ArcInstanceMsg_LaunchApp(package, activity)); |
| 126 } |
| 127 |
| 128 bool ArcBridgeServiceImpl::RequestIcon(const std::string& package, |
| 129 const std::string& activity, |
| 130 int scale_factor) { |
| 131 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); |
| 132 if (state() != State::READY) { |
| 133 LOG(ERROR) << "Called RequestIcon when the service is not ready"; |
| 134 return false; |
| 135 } |
| 136 return ipc_channel_->Send(new ArcInstanceMsg_RequestIcon(package, |
| 137 activity, |
| 138 scale_factor)); |
| 139 } |
| 140 |
| 141 void ArcBridgeServiceImpl::SocketConnect(const base::FilePath& socket_path) { |
| 142 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); |
| 143 if (state() != State::STOPPED) { |
| 140 VLOG(1) << "SocketConnect() called when instance is not stopped"; | 144 VLOG(1) << "SocketConnect() called when instance is not stopped"; |
| 141 return; | 145 return; |
| 142 } | 146 } |
| 143 SetState(State::CONNECTING); | 147 SetState(State::CONNECTING); |
| 144 base::PostTaskAndReplyWithResult( | 148 base::PostTaskAndReplyWithResult( |
| 145 file_task_runner_.get(), FROM_HERE, | 149 file_task_runner_.get(), FROM_HERE, |
| 146 base::Bind(&base::CreateDirectory, socket_path.DirName()), | 150 base::Bind(&base::CreateDirectory, socket_path.DirName()), |
| 147 base::Bind(&ArcBridgeService::SocketConnectAfterEnsureParentDirectory, | 151 base::Bind(&ArcBridgeServiceImpl::SocketConnectAfterEnsureParentDirectory, |
| 148 weak_factory_.GetWeakPtr(), socket_path)); | 152 weak_factory_.GetWeakPtr(), socket_path)); |
| 149 } | 153 } |
| 150 | 154 |
| 151 void ArcBridgeService::SocketConnectAfterEnsureParentDirectory( | 155 void ArcBridgeServiceImpl::SocketConnectAfterEnsureParentDirectory( |
| 152 const base::FilePath& socket_path, | 156 const base::FilePath& socket_path, |
| 153 bool directory_present) { | 157 bool directory_present) { |
| 154 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); | 158 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); |
| 155 if (state_ != State::CONNECTING) { | 159 if (state() != State::CONNECTING) { |
| 156 VLOG(1) << "StopInstance() called while connecting"; | 160 VLOG(1) << "StopInstance() called while connecting"; |
| 157 return; | 161 return; |
| 158 } | 162 } |
| 159 if (!directory_present) { | 163 if (!directory_present) { |
| 160 LOG(ERROR) << "Error creating directory for " << socket_path.value(); | 164 LOG(ERROR) << "Error creating directory for " << socket_path.value(); |
| 161 StopInstance(); | 165 StopInstance(); |
| 162 return; | 166 return; |
| 163 } | 167 } |
| 164 | 168 |
| 165 if (!Connect(IPC::ChannelHandle(socket_path.value()), | 169 if (!Connect(IPC::ChannelHandle(socket_path.value()), |
| 166 IPC::Channel::MODE_OPEN_NAMED_SERVER)) { | 170 IPC::Channel::MODE_OPEN_NAMED_SERVER)) { |
| 167 LOG(ERROR) << "Error connecting to " << socket_path.value(); | 171 LOG(ERROR) << "Error connecting to " << socket_path.value(); |
| 168 StopInstance(); | 172 StopInstance(); |
| 169 return; | 173 return; |
| 170 } | 174 } |
| 171 | 175 |
| 172 base::PostTaskAndReplyWithResult( | 176 base::PostTaskAndReplyWithResult( |
| 173 file_task_runner_.get(), FROM_HERE, | 177 file_task_runner_.get(), FROM_HERE, |
| 174 // TODO(lhchavez): Tighten the security around the socket by tying it to | 178 // TODO(lhchavez): Tighten the security around the socket by tying it to |
| 175 // the user the instance will run as. | 179 // the user the instance will run as. |
| 176 base::Bind(&base::SetPosixFilePermissions, socket_path, 0777), | 180 base::Bind(&base::SetPosixFilePermissions, socket_path, 0777), |
| 177 base::Bind(&ArcBridgeService::SocketConnectAfterSetSocketPermissions, | 181 base::Bind(&ArcBridgeServiceImpl::SocketConnectAfterSetSocketPermissions, |
| 178 weak_factory_.GetWeakPtr(), socket_path)); | 182 weak_factory_.GetWeakPtr(), socket_path)); |
| 179 } | 183 } |
| 180 | 184 |
| 181 bool ArcBridgeService::Connect(const IPC::ChannelHandle& handle, | 185 bool ArcBridgeServiceImpl::Connect(const IPC::ChannelHandle& handle, |
| 182 IPC::Channel::Mode mode) { | 186 IPC::Channel::Mode mode) { |
| 183 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); | 187 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); |
| 184 if (state_ != State::CONNECTING) { | 188 if (state() != State::CONNECTING) { |
| 185 VLOG(1) << "StopInstance() called while connecting"; | 189 VLOG(1) << "StopInstance() called while connecting"; |
| 186 return false; | 190 return false; |
| 187 } | 191 } |
| 188 | 192 |
| 189 ipc_channel_ = | 193 ipc_channel_ = |
| 190 IPC::ChannelProxy::Create(handle, mode, this, ipc_task_runner_.get()); | 194 IPC::ChannelProxy::Create(handle, mode, this, ipc_task_runner_.get()); |
| 191 if (!ipc_channel_) | 195 if (!ipc_channel_) |
| 192 return false; | 196 return false; |
| 193 SetState(State::CONNECTED); | 197 SetState(State::CONNECTED); |
| 194 return true; | 198 return true; |
| 195 } | 199 } |
| 196 | 200 |
| 197 void ArcBridgeService::SocketConnectAfterSetSocketPermissions( | 201 void ArcBridgeServiceImpl::SocketConnectAfterSetSocketPermissions( |
| 198 const base::FilePath& socket_path, | 202 const base::FilePath& socket_path, |
| 199 bool socket_permissions_success) { | 203 bool socket_permissions_success) { |
| 200 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); | 204 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); |
| 201 if (state_ != State::CONNECTED) { | 205 if (state() != State::CONNECTED) { |
| 202 VLOG(1) << "StopInstance() called while connecting"; | 206 VLOG(1) << "StopInstance() called while connecting"; |
| 203 return; | 207 return; |
| 204 } | 208 } |
| 205 | 209 |
| 206 if (!socket_permissions_success) { | 210 if (!socket_permissions_success) { |
| 207 LOG(ERROR) << "Error setting socket permissions for " | 211 LOG(ERROR) << "Error setting socket permissions for " |
| 208 << socket_path.value(); | 212 << socket_path.value(); |
| 209 StopInstance(); | 213 StopInstance(); |
| 210 return; | 214 return; |
| 211 } | 215 } |
| 212 | 216 |
| 213 SetState(State::STARTING); | 217 SetState(State::STARTING); |
| 214 chromeos::SessionManagerClient* session_manager_client = | 218 chromeos::SessionManagerClient* session_manager_client = |
| 215 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(); | 219 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(); |
| 216 session_manager_client->StartArcInstance( | 220 session_manager_client->StartArcInstance( |
| 217 socket_path.value(), base::Bind(&ArcBridgeService::OnInstanceStarted, | 221 socket_path.value(), base::Bind(&ArcBridgeServiceImpl::OnInstanceStarted, |
| 218 weak_factory_.GetWeakPtr())); | 222 weak_factory_.GetWeakPtr())); |
| 219 } | 223 } |
| 220 | 224 |
| 221 void ArcBridgeService::OnInstanceStarted(bool success) { | 225 void ArcBridgeServiceImpl::OnInstanceStarted(bool success) { |
| 222 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); | 226 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); |
| 223 if (state_ != State::STARTING) { | 227 if (state() != State::STARTING) { |
| 224 VLOG(1) << "StopInstance() called while connecting"; | 228 VLOG(1) << "StopInstance() called while connecting"; |
| 225 return; | 229 return; |
| 226 } | 230 } |
| 227 if (!success) { | 231 if (!success) { |
| 228 LOG(ERROR) << "ARC instance unable to start. Shutting down the bridge"; | 232 LOG(ERROR) << "ARC instance unable to start. Shutting down the bridge"; |
| 229 StopInstance(); | 233 StopInstance(); |
| 230 return; | 234 return; |
| 231 } | 235 } |
| 232 } | 236 } |
| 233 | 237 |
| 234 void ArcBridgeService::OnInstanceBootPhase(InstanceBootPhase phase) { | 238 void ArcBridgeServiceImpl::OnInstanceBootPhase(InstanceBootPhase phase) { |
| 235 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); | 239 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); |
| 236 if (state_ != State::STARTING) { | 240 if (state() != State::STARTING) { |
| 237 VLOG(1) << "StopInstance() called while connecting"; | 241 VLOG(1) << "StopInstance() called while connecting"; |
| 238 return; | 242 return; |
| 239 } | 243 } |
| 240 if (phase == InstanceBootPhase::BRIDGE_READY) { | 244 if (phase == InstanceBootPhase::BRIDGE_READY) { |
| 241 SetState(State::READY); | 245 SetState(State::READY); |
| 242 } | 246 } |
| 243 FOR_EACH_OBSERVER(Observer, observer_list_, OnInstanceBootPhase(phase)); | 247 FOR_EACH_OBSERVER(Observer, observer_list_, OnInstanceBootPhase(phase)); |
| 244 } | 248 } |
| 245 | 249 |
| 246 void ArcBridgeService::SetState(State state) { | 250 bool ArcBridgeServiceImpl::OnMessageReceived(const IPC::Message& message) { |
| 247 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); | |
| 248 // DCHECK on enum classes not supported. | |
| 249 DCHECK(state_ != state); | |
| 250 state_ = state; | |
| 251 FOR_EACH_OBSERVER(Observer, observer_list_, OnStateChanged(state_)); | |
| 252 } | |
| 253 | |
| 254 bool ArcBridgeService::OnMessageReceived(const IPC::Message& message) { | |
| 255 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); | 251 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); |
| 256 bool handled = true; | 252 bool handled = true; |
| 257 | 253 |
| 258 IPC_BEGIN_MESSAGE_MAP(ArcBridgeService, message) | 254 IPC_BEGIN_MESSAGE_MAP(ArcBridgeServiceImpl, message) |
| 259 IPC_MESSAGE_HANDLER(ArcInstanceHostMsg_InstanceBootPhase, | 255 IPC_MESSAGE_HANDLER(ArcInstanceHostMsg_InstanceBootPhase, |
| 260 OnInstanceBootPhase) | 256 OnInstanceBootPhase) |
| 257 IPC_MESSAGE_HANDLER(ArcInstanceHostMsg_AppsRefreshed, OnAppsRefreshed) |
| 258 IPC_MESSAGE_HANDLER(ArcInstanceHostMsg_AppIcon, OnAppIcon) |
| 261 IPC_MESSAGE_UNHANDLED(handled = false) | 259 IPC_MESSAGE_UNHANDLED(handled = false) |
| 262 IPC_END_MESSAGE_MAP() | 260 IPC_END_MESSAGE_MAP() |
| 263 | 261 |
| 264 if (!handled) | 262 if (!handled) |
| 265 LOG(ERROR) << "Invalid message with type = " << message.type(); | 263 LOG(ERROR) << "Invalid message with type = " << message.type(); |
| 266 return handled; | 264 return handled; |
| 267 } | 265 } |
| 268 | 266 |
| 269 void ArcBridgeService::OnArcAvailable(bool available) { | 267 void ArcBridgeServiceImpl::OnAppsRefreshed( |
| 268 const std::vector<std::string>& names, |
| 269 const std::vector<std::string>& packages, |
| 270 const std::vector<std::string>& activities) { |
| 270 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); | 271 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); |
| 271 if (available_ == available) | 272 DCHECK(names.size() == packages.size() && names.size() == activities.size()); |
| 273 FOR_EACH_OBSERVER(Observer, observer_list_, OnAppsRefreshed(names, |
| 274 packages, |
| 275 activities)); |
| 276 } |
| 277 |
| 278 void ArcBridgeServiceImpl::OnAppIcon(const std::string& package, |
| 279 const std::string& activity, |
| 280 int scale_factor, |
| 281 const std::vector<uint8_t>& icon_png_data) { |
| 282 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); |
| 283 FOR_EACH_OBSERVER(Observer, observer_list_, OnAppIcon(package, |
| 284 activity, |
| 285 scale_factor, |
| 286 icon_png_data)); |
| 287 } |
| 288 |
| 289 void ArcBridgeServiceImpl::OnArcAvailable(bool arc_available) { |
| 290 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); |
| 291 if (available() == arc_available) |
| 272 return; | 292 return; |
| 273 available_ = available; | 293 SetAvailable(arc_available); |
| 274 FOR_EACH_OBSERVER(Observer, observer_list_, OnAvailableChanged(available_)); | |
| 275 PrerequisitesChanged(); | 294 PrerequisitesChanged(); |
| 276 } | 295 } |
| 277 | 296 |
| 278 void ArcBridgeService::OnInstanceStopped(bool success) { | 297 void ArcBridgeServiceImpl::OnInstanceStopped(bool success) { |
| 279 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); | 298 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); |
| 280 // STOPPING is the only valid state for this function. | 299 // STOPPING is the only valid state for this function. |
| 281 // DCHECK on enum classes not supported. | 300 // DCHECK on enum classes not supported. |
| 282 DCHECK(state_ == State::STOPPING); | 301 DCHECK(state() == State::STOPPING); |
| 283 ipc_channel_.reset(); | 302 ipc_channel_.reset(); |
| 284 SetState(State::STOPPED); | 303 SetState(State::STOPPED); |
| 285 } | 304 } |
| 286 | 305 |
| 287 } // namespace arc | 306 } // namespace arc |
| OLD | NEW |