Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/ui/webui/settings/people_handler.h" | 5 #include "chrome/browser/ui/webui/settings/people_handler.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 189 web_ui()->RegisterMessageCallback( | 189 web_ui()->RegisterMessageCallback( |
| 190 "SyncSetupShowSetupUI", | 190 "SyncSetupShowSetupUI", |
| 191 base::Bind(&PeopleHandler::HandleShowSetupUI, base::Unretained(this))); | 191 base::Bind(&PeopleHandler::HandleShowSetupUI, base::Unretained(this))); |
| 192 web_ui()->RegisterMessageCallback( | 192 web_ui()->RegisterMessageCallback( |
| 193 "SyncSetupGetSyncStatus", | 193 "SyncSetupGetSyncStatus", |
| 194 base::Bind(&PeopleHandler::HandleGetSyncStatus, base::Unretained(this))); | 194 base::Bind(&PeopleHandler::HandleGetSyncStatus, base::Unretained(this))); |
| 195 web_ui()->RegisterMessageCallback( | 195 web_ui()->RegisterMessageCallback( |
| 196 "SyncSetupManageOtherPeople", | 196 "SyncSetupManageOtherPeople", |
| 197 base::Bind(&PeopleHandler::HandleManageOtherPeople, | 197 base::Bind(&PeopleHandler::HandleManageOtherPeople, |
| 198 base::Unretained(this))); | 198 base::Unretained(this))); |
| 199 | |
|
jdufault
2016/09/13 22:28:35
Revert
sammiequon
2016/09/14 02:00:56
Done.
| |
| 199 #if defined(OS_CHROMEOS) | 200 #if defined(OS_CHROMEOS) |
| 200 web_ui()->RegisterMessageCallback( | 201 web_ui()->RegisterMessageCallback( |
| 201 "SyncSetupDoSignOutOnAuthError", | 202 "SyncSetupDoSignOutOnAuthError", |
| 202 base::Bind(&PeopleHandler::HandleDoSignOutOnAuthError, | 203 base::Bind(&PeopleHandler::HandleDoSignOutOnAuthError, |
| 203 base::Unretained(this))); | 204 base::Unretained(this))); |
| 204 #else | 205 #else |
| 205 web_ui()->RegisterMessageCallback( | 206 web_ui()->RegisterMessageCallback( |
| 206 "SyncSetupStopSyncing", | 207 "SyncSetupStopSyncing", |
| 207 base::Bind(&PeopleHandler::HandleStopSyncing, base::Unretained(this))); | 208 base::Bind(&PeopleHandler::HandleStopSyncing, base::Unretained(this))); |
| 208 web_ui()->RegisterMessageCallback( | 209 web_ui()->RegisterMessageCallback( |
| (...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 897 base::FilePath profile_file_path = profile_->GetPath(); | 898 base::FilePath profile_file_path = profile_->GetPath(); |
| 898 ProfileMetrics::LogProfileSyncSignIn(profile_file_path); | 899 ProfileMetrics::LogProfileSyncSignIn(profile_file_path); |
| 899 | 900 |
| 900 // We're done configuring, so notify ProfileSyncService that it is OK to | 901 // We're done configuring, so notify ProfileSyncService that it is OK to |
| 901 // start syncing. | 902 // start syncing. |
| 902 sync_blocker_.reset(); | 903 sync_blocker_.reset(); |
| 903 service->SetFirstSetupComplete(); | 904 service->SetFirstSetupComplete(); |
| 904 } | 905 } |
| 905 | 906 |
| 906 } // namespace settings | 907 } // namespace settings |
| OLD | NEW |