| 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 539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 550 AllowJavascript(); | 550 AllowJavascript(); |
| 551 | 551 |
| 552 CHECK_EQ(1U, args->GetSize()); | 552 CHECK_EQ(1U, args->GetSize()); |
| 553 const base::Value* callback_id; | 553 const base::Value* callback_id; |
| 554 CHECK(args->Get(0, &callback_id)); | 554 CHECK(args->Get(0, &callback_id)); |
| 555 | 555 |
| 556 ResolveJavascriptCallback(*callback_id, *GetSyncStatusDictionary()); | 556 ResolveJavascriptCallback(*callback_id, *GetSyncStatusDictionary()); |
| 557 } | 557 } |
| 558 | 558 |
| 559 void PeopleHandler::HandleManageOtherPeople(const base::ListValue* /* args */) { | 559 void PeopleHandler::HandleManageOtherPeople(const base::ListValue* /* args */) { |
| 560 UserManager::Show(base::FilePath(), profiles::USER_MANAGER_NO_TUTORIAL, | 560 UserManager::Show(base::FilePath(), |
| 561 profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION); | 561 profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION); |
| 562 } | 562 } |
| 563 | 563 |
| 564 void PeopleHandler::CloseSyncSetup() { | 564 void PeopleHandler::CloseSyncSetup() { |
| 565 // Stop a timer to handle timeout in waiting for checking network connection. | 565 // Stop a timer to handle timeout in waiting for checking network connection. |
| 566 engine_start_timer_.reset(); | 566 engine_start_timer_.reset(); |
| 567 | 567 |
| 568 // Clear the sync startup tracker, since the setup wizard is being closed. | 568 // Clear the sync startup tracker, since the setup wizard is being closed. |
| 569 sync_startup_tracker_.reset(); | 569 sync_startup_tracker_.reset(); |
| 570 | 570 |
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 904 base::FilePath profile_file_path = profile_->GetPath(); | 904 base::FilePath profile_file_path = profile_->GetPath(); |
| 905 ProfileMetrics::LogProfileSyncSignIn(profile_file_path); | 905 ProfileMetrics::LogProfileSyncSignIn(profile_file_path); |
| 906 | 906 |
| 907 // We're done configuring, so notify ProfileSyncService that it is OK to | 907 // We're done configuring, so notify ProfileSyncService that it is OK to |
| 908 // start syncing. | 908 // start syncing. |
| 909 sync_blocker_.reset(); | 909 sync_blocker_.reset(); |
| 910 service->SetFirstSetupComplete(); | 910 service->SetFirstSetupComplete(); |
| 911 } | 911 } |
| 912 | 912 |
| 913 } // namespace settings | 913 } // namespace settings |
| OLD | NEW |