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

Unified Diff: components/pairing/bluetooth_controller_pairing_controller.cc

Issue 491943004: Update the pairing API to include configuration and enrollment. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comment some TODOs Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: components/pairing/bluetooth_controller_pairing_controller.cc
diff --git a/components/pairing/bluetooth_controller_pairing_controller.cc b/components/pairing/bluetooth_controller_pairing_controller.cc
index c90dfb7918b3d4345c79176f1987764001e68056..73b6a24de7c7469c043050fa8fa31a90ed455433 100644
--- a/components/pairing/bluetooth_controller_pairing_controller.cc
+++ b/components/pairing/bluetooth_controller_pairing_controller.cc
@@ -304,20 +304,24 @@ void BluetoothControllerPairingController::SetConfirmationCodeIsCorrect(
}
}
-void BluetoothControllerPairingController::OnAuthenticationDone(
- const chromeos::UserContext& user_context,
- content::BrowserContext* browser_context) {
- DCHECK_EQ(current_stage_, STAGE_WAITING_FOR_CREDENTIALS);
-
+void BluetoothControllerPairingController::SetHostConfiguration(
+ bool accepted_eula,
+ const std::string& lang,
+ const std::string& timezone,
+ bool send_reports,
+ const std::string& keyboard_layout) {
// TODO(zork): Get configuration from UI and send to Host.
// (http://crbug.com/405744)
+}
+
+void BluetoothControllerPairingController::OnAuthenticationDone(
+ const std::string& domain,
achuithb 2014/08/27 21:41:36 Is domain used?
Zachary Kuznia 2014/08/27 22:01:49 Leaving it per the design, as discussed.
+ const std::string& auth_token) {
+ DCHECK_EQ(current_stage_, STAGE_WAITING_FOR_CREDENTIALS);
- // TODO(zork): Get proper credentials. (http://crbug.com/405744)
- // For now, send a fake domain.
pairing_api::PairDevices pair_devices;
pair_devices.set_api_version(kPairingAPIVersion);
- pair_devices.mutable_parameters()->set_admin_access_token(
- kFakeEnrollmentDomain);
+ pair_devices.mutable_parameters()->set_admin_access_token(auth_token);
int size = 0;
scoped_refptr<net::IOBuffer> io_buffer(

Powered by Google App Engine
This is Rietveld 408576698