OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chromeos/dbus/session_manager_client.h" | 5 #include "chromeos/dbus/session_manager_client.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 #include <sys/socket.h> | 9 #include <sys/socket.h> |
10 | 10 |
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
339 login_manager::kSessionManagerInterface, | 339 login_manager::kSessionManagerInterface, |
340 login_manager::kSessionManagerCheckArcAvailability); | 340 login_manager::kSessionManagerCheckArcAvailability); |
341 | 341 |
342 session_manager_proxy_->CallMethod( | 342 session_manager_proxy_->CallMethod( |
343 &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, | 343 &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
344 base::Bind(&SessionManagerClientImpl::OnCheckArcAvailability, | 344 base::Bind(&SessionManagerClientImpl::OnCheckArcAvailability, |
345 weak_ptr_factory_.GetWeakPtr(), callback)); | 345 weak_ptr_factory_.GetWeakPtr(), callback)); |
346 } | 346 } |
347 | 347 |
348 void StartArcInstance(const std::string& socket_path, | 348 void StartArcInstance(const std::string& socket_path, |
| 349 const cryptohome::Identification& cryptohome_id, |
349 const ArcCallback& callback) override { | 350 const ArcCallback& callback) override { |
350 dbus::MethodCall method_call( | 351 dbus::MethodCall method_call( |
351 login_manager::kSessionManagerInterface, | 352 login_manager::kSessionManagerInterface, |
352 login_manager::kSessionManagerStartArcInstance); | 353 login_manager::kSessionManagerStartArcInstance); |
353 dbus::MessageWriter writer(&method_call); | 354 dbus::MessageWriter writer(&method_call); |
354 writer.AppendString(socket_path); | 355 writer.AppendString(socket_path); |
| 356 writer.AppendString(cryptohome_id.id()); |
355 session_manager_proxy_->CallMethod( | 357 session_manager_proxy_->CallMethod( |
356 &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, | 358 &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
357 base::Bind(&SessionManagerClientImpl::OnArcMethod, | 359 base::Bind(&SessionManagerClientImpl::OnArcMethod, |
358 weak_ptr_factory_.GetWeakPtr(), | 360 weak_ptr_factory_.GetWeakPtr(), |
359 login_manager::kSessionManagerStartArcInstance, callback)); | 361 login_manager::kSessionManagerStartArcInstance, callback)); |
360 } | 362 } |
361 | 363 |
362 void StopArcInstance(const ArcCallback& callback) override { | 364 void StopArcInstance(const ArcCallback& callback) override { |
363 dbus::MethodCall method_call(login_manager::kSessionManagerInterface, | 365 dbus::MethodCall method_call(login_manager::kSessionManagerInterface, |
364 login_manager::kSessionManagerStopArcInstance); | 366 login_manager::kSessionManagerStopArcInstance); |
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
899 | 901 |
900 if (!callback.is_null()) | 902 if (!callback.is_null()) |
901 callback.Run(state_keys); | 903 callback.Run(state_keys); |
902 } | 904 } |
903 | 905 |
904 void CheckArcAvailability(const ArcCallback& callback) override { | 906 void CheckArcAvailability(const ArcCallback& callback) override { |
905 callback.Run(false); | 907 callback.Run(false); |
906 } | 908 } |
907 | 909 |
908 void StartArcInstance(const std::string& socket_path, | 910 void StartArcInstance(const std::string& socket_path, |
| 911 const cryptohome::Identification& cryptohome_id, |
909 const ArcCallback& callback) override { | 912 const ArcCallback& callback) override { |
910 callback.Run(false); | 913 callback.Run(false); |
911 } | 914 } |
912 | 915 |
913 void StopArcInstance(const ArcCallback& callback) override { | 916 void StopArcInstance(const ArcCallback& callback) override { |
914 callback.Run(false); | 917 callback.Run(false); |
915 } | 918 } |
916 | 919 |
917 void GetArcStartTime(const GetArcStartTimeCallback& callback) override { | 920 void GetArcStartTime(const GetArcStartTimeCallback& callback) override { |
918 callback.Run(false, base::TimeTicks::Now()); | 921 callback.Run(false, base::TimeTicks::Now()); |
(...skipping 16 matching lines...) Expand all Loading... |
935 | 938 |
936 SessionManagerClient* SessionManagerClient::Create( | 939 SessionManagerClient* SessionManagerClient::Create( |
937 DBusClientImplementationType type) { | 940 DBusClientImplementationType type) { |
938 if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) | 941 if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) |
939 return new SessionManagerClientImpl(); | 942 return new SessionManagerClientImpl(); |
940 DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type); | 943 DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type); |
941 return new SessionManagerClientStubImpl(); | 944 return new SessionManagerClientStubImpl(); |
942 } | 945 } |
943 | 946 |
944 } // namespace chromeos | 947 } // namespace chromeos |
OLD | NEW |