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