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

Side by Side Diff: chrome/browser/signin/easy_unlock_service_regular.cc

Issue 1552863003: Global conversion of Pass()→std::move(): CrOS edition (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
OLDNEW
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 "chrome/browser/signin/easy_unlock_service_regular.h" 5 #include "chrome/browser/signin/easy_unlock_service_regular.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/base64url.h" 10 #include "base/base64url.h"
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 138
139 dict->SetString("name", device.name); 139 dict->SetString("name", device.name);
140 dict->SetString("psk", b64_psk); 140 dict->SetString("psk", b64_psk);
141 dict->SetString("bluetoothAddress", device.bluetooth_address); 141 dict->SetString("bluetoothAddress", device.bluetooth_address);
142 dict->SetInteger("bluetoothType", static_cast<int>(device.bluetooth_type)); 142 dict->SetInteger("bluetoothType", static_cast<int>(device.bluetooth_type));
143 dict->SetString("permitId", "permit://google.com/easyunlock/v1/" + 143 dict->SetString("permitId", "permit://google.com/easyunlock/v1/" +
144 proximity_auth_client()->GetAccountId()); 144 proximity_auth_client()->GetAccountId());
145 dict->SetString("permitRecord.id", b64_public_key); 145 dict->SetString("permitRecord.id", b64_public_key);
146 dict->SetString("permitRecord.type", "license"); 146 dict->SetString("permitRecord.type", "license");
147 dict->SetString("permitRecord.data", b64_public_key); 147 dict->SetString("permitRecord.data", b64_public_key);
148 device_list->Append(dict.Pass()); 148 device_list->Append(std::move(dict));
149 } 149 }
150 150
151 // TODO(tengs): Rename this function after the easy_unlock app is replaced. 151 // TODO(tengs): Rename this function after the easy_unlock app is replaced.
152 SetRemoteDevices(*device_list); 152 SetRemoteDevices(*device_list);
153 #endif 153 #endif
154 } 154 }
155 155
156 EasyUnlockService::Type EasyUnlockServiceRegular::GetType() const { 156 EasyUnlockService::Type EasyUnlockServiceRegular::GetType() const {
157 return EasyUnlockService::TYPE_REGULAR; 157 return EasyUnlockService::TYPE_REGULAR;
158 } 158 }
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after
677 PA_LOG(INFO) << "Refresh token not yet available, " 677 PA_LOG(INFO) << "Refresh token not yet available, "
678 << "waiting before starting CryptAuth managers"; 678 << "waiting before starting CryptAuth managers";
679 token_service->AddObserver(this); 679 token_service->AddObserver(this);
680 } 680 }
681 681
682 device_manager_->AddObserver(this); 682 device_manager_->AddObserver(this);
683 enrollment_manager_->Start(); 683 enrollment_manager_->Start();
684 device_manager_->Start(); 684 device_manager_->Start();
685 } 685 }
686 #endif 686 #endif
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_io_data.cc ('k') | chrome/browser/signin/easy_unlock_service_unittest_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698