| 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 850 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 861 passphrase_time_str)); | 861 passphrase_time_str)); |
| 862 break; | 862 break; |
| 863 default: | 863 default: |
| 864 args.SetString("fullEncryptionBody", | 864 args.SetString("fullEncryptionBody", |
| 865 GetStringUTF16(IDS_SYNC_FULL_ENCRYPTION_BODY_CUSTOM)); | 865 GetStringUTF16(IDS_SYNC_FULL_ENCRYPTION_BODY_CUSTOM)); |
| 866 break; | 866 break; |
| 867 } | 867 } |
| 868 } else if (passphrase_type == syncer::PassphraseType::CUSTOM_PASSPHRASE) { | 868 } else if (passphrase_type == syncer::PassphraseType::CUSTOM_PASSPHRASE) { |
| 869 args.SetString("fullEncryptionBody", | 869 args.SetString("fullEncryptionBody", |
| 870 GetStringUTF16(IDS_SYNC_FULL_ENCRYPTION_BODY_CUSTOM)); | 870 GetStringUTF16(IDS_SYNC_FULL_ENCRYPTION_BODY_CUSTOM)); |
| 871 } else { | |
| 872 args.SetString("fullEncryptionBody", | |
| 873 GetStringUTF16(IDS_SYNC_FULL_ENCRYPTION_DATA)); | |
| 874 } | 871 } |
| 875 | 872 |
| 876 CallJavascriptFunction("cr.webUIListenerCallback", | 873 CallJavascriptFunction("cr.webUIListenerCallback", |
| 877 base::StringValue("sync-prefs-changed"), args); | 874 base::StringValue("sync-prefs-changed"), args); |
| 878 } | 875 } |
| 879 | 876 |
| 880 LoginUIService* PeopleHandler::GetLoginUIService() const { | 877 LoginUIService* PeopleHandler::GetLoginUIService() const { |
| 881 return LoginUIServiceFactory::GetForProfile(profile_); | 878 return LoginUIServiceFactory::GetForProfile(profile_); |
| 882 } | 879 } |
| 883 | 880 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 901 base::FilePath profile_file_path = profile_->GetPath(); | 898 base::FilePath profile_file_path = profile_->GetPath(); |
| 902 ProfileMetrics::LogProfileSyncSignIn(profile_file_path); | 899 ProfileMetrics::LogProfileSyncSignIn(profile_file_path); |
| 903 | 900 |
| 904 // 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 |
| 905 // start syncing. | 902 // start syncing. |
| 906 sync_blocker_.reset(); | 903 sync_blocker_.reset(); |
| 907 service->SetFirstSetupComplete(); | 904 service->SetFirstSetupComplete(); |
| 908 } | 905 } |
| 909 | 906 |
| 910 } // namespace settings | 907 } // namespace settings |
| OLD | NEW |