OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/proximity_auth/client.h" | 5 #include "components/proximity_auth/client.h" |
6 | 6 |
7 #include "base/json/json_reader.h" | 7 #include "base/json/json_reader.h" |
8 #include "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
9 #include "base/values.h" | 9 #include "base/values.h" |
10 #include "components/proximity_auth/base64url.h" | |
11 #include "components/proximity_auth/client_observer.h" | 10 #include "components/proximity_auth/client_observer.h" |
12 #include "components/proximity_auth/connection.h" | 11 #include "components/proximity_auth/connection.h" |
| 12 #include "components/proximity_auth/cryptauth/base64url.h" |
13 #include "components/proximity_auth/remote_status_update.h" | 13 #include "components/proximity_auth/remote_status_update.h" |
14 #include "components/proximity_auth/secure_context.h" | 14 #include "components/proximity_auth/secure_context.h" |
15 #include "components/proximity_auth/wire_message.h" | 15 #include "components/proximity_auth/wire_message.h" |
16 | 16 |
17 namespace proximity_auth { | 17 namespace proximity_auth { |
18 namespace { | 18 namespace { |
19 | 19 |
20 // The key names of JSON fields for messages sent between the devices. | 20 // The key names of JSON fields for messages sent between the devices. |
21 const char kTypeKey[] = "type"; | 21 const char kTypeKey[] = "type"; |
22 const char kNameKey[] = "name"; | 22 const char kNameKey[] = "name"; |
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
280 } else { | 280 } else { |
281 VLOG(1) << "[Client] Message of unknown type '" << pending_message_->type | 281 VLOG(1) << "[Client] Message of unknown type '" << pending_message_->type |
282 << "sent."; | 282 << "sent."; |
283 } | 283 } |
284 | 284 |
285 pending_message_.reset(); | 285 pending_message_.reset(); |
286 ProcessMessageQueue(); | 286 ProcessMessageQueue(); |
287 } | 287 } |
288 | 288 |
289 } // namespace proximity_auth | 289 } // namespace proximity_auth |
OLD | NEW |