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

Side by Side Diff: chromeos/dbus/session_manager_client.cc

Issue 2023803003: arc: Send cryptohome ID on starting ARC instance. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: s/GetActiveUser/GetPrimaryUser/g 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
« no previous file with comments | « chromeos/dbus/session_manager_client.h ('k') | components/arc/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 dbus::MethodCall method_call( 338 dbus::MethodCall method_call(
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 cryptohome::Identification& cryptohome_id,
349 const ArcCallback& callback) override { 349 const ArcCallback& callback) override {
350 dbus::MethodCall method_call( 350 dbus::MethodCall method_call(
351 login_manager::kSessionManagerInterface, 351 login_manager::kSessionManagerInterface,
352 login_manager::kSessionManagerStartArcInstance); 352 login_manager::kSessionManagerStartArcInstance);
353 dbus::MessageWriter writer(&method_call); 353 dbus::MessageWriter writer(&method_call);
354 writer.AppendString(socket_path); 354 writer.AppendString(cryptohome_id.id());
355 session_manager_proxy_->CallMethod( 355 session_manager_proxy_->CallMethod(
356 &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, 356 &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
357 base::Bind(&SessionManagerClientImpl::OnArcMethod, 357 base::Bind(&SessionManagerClientImpl::OnArcMethod,
358 weak_ptr_factory_.GetWeakPtr(), 358 weak_ptr_factory_.GetWeakPtr(),
359 login_manager::kSessionManagerStartArcInstance, callback)); 359 login_manager::kSessionManagerStartArcInstance, callback));
360 } 360 }
361 361
362 void StopArcInstance(const ArcCallback& callback) override { 362 void StopArcInstance(const ArcCallback& callback) override {
363 dbus::MethodCall method_call(login_manager::kSessionManagerInterface, 363 dbus::MethodCall method_call(login_manager::kSessionManagerInterface,
364 login_manager::kSessionManagerStopArcInstance); 364 login_manager::kSessionManagerStopArcInstance);
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
898 state_keys.push_back(crypto::SHA256HashString(base::IntToString(i))); 898 state_keys.push_back(crypto::SHA256HashString(base::IntToString(i)));
899 899
900 if (!callback.is_null()) 900 if (!callback.is_null())
901 callback.Run(state_keys); 901 callback.Run(state_keys);
902 } 902 }
903 903
904 void CheckArcAvailability(const ArcCallback& callback) override { 904 void CheckArcAvailability(const ArcCallback& callback) override {
905 callback.Run(false); 905 callback.Run(false);
906 } 906 }
907 907
908 void StartArcInstance(const std::string& socket_path, 908 void StartArcInstance(const cryptohome::Identification& cryptohome_id,
909 const ArcCallback& callback) override { 909 const ArcCallback& callback) override {
910 callback.Run(false); 910 callback.Run(false);
911 } 911 }
912 912
913 void StopArcInstance(const ArcCallback& callback) override { 913 void StopArcInstance(const ArcCallback& callback) override {
914 callback.Run(false); 914 callback.Run(false);
915 } 915 }
916 916
917 void GetArcStartTime(const GetArcStartTimeCallback& callback) override { 917 void GetArcStartTime(const GetArcStartTimeCallback& callback) override {
918 callback.Run(false, base::TimeTicks::Now()); 918 callback.Run(false, base::TimeTicks::Now());
(...skipping 16 matching lines...) Expand all
935 935
936 SessionManagerClient* SessionManagerClient::Create( 936 SessionManagerClient* SessionManagerClient::Create(
937 DBusClientImplementationType type) { 937 DBusClientImplementationType type) {
938 if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) 938 if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
939 return new SessionManagerClientImpl(); 939 return new SessionManagerClientImpl();
940 DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type); 940 DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
941 return new SessionManagerClientStubImpl(); 941 return new SessionManagerClientStubImpl();
942 } 942 }
943 943
944 } // namespace chromeos 944 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/dbus/session_manager_client.h ('k') | components/arc/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698