| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/signin/signin_create_profile_handler.h" | 5 #include "chrome/browser/ui/webui/signin/signin_create_profile_handler.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 IDS_LEGACY_SUPERVISED_USER_LEARN_MORE_DONE_BUTTON)); | 84 IDS_LEGACY_SUPERVISED_USER_LEARN_MORE_DONE_BUTTON)); |
| 85 localized_strings->SetString( | 85 localized_strings->SetString( |
| 86 "supervisedUserLearnMoreText", | 86 "supervisedUserLearnMoreText", |
| 87 l10n_util::GetStringFUTF16( | 87 l10n_util::GetStringFUTF16( |
| 88 IDS_SUPERVISED_USER_LEARN_MORE_TEXT, | 88 IDS_SUPERVISED_USER_LEARN_MORE_TEXT, |
| 89 base::ASCIIToUTF16( | 89 base::ASCIIToUTF16( |
| 90 chrome::kLegacySupervisedUserManagementURL), | 90 chrome::kLegacySupervisedUserManagementURL), |
| 91 base::ASCIIToUTF16( | 91 base::ASCIIToUTF16( |
| 92 chrome::kLegacySupervisedUserManagementDisplayURL))); | 92 chrome::kLegacySupervisedUserManagementDisplayURL))); |
| 93 localized_strings->SetString( | 93 localized_strings->SetString( |
| 94 "importExistingSupervisedUserLink", |
| 95 l10n_util::GetStringUTF16( |
| 96 IDS_IMPORT_EXISTING_LEGACY_SUPERVISED_USER_TITLE)); |
| 97 localized_strings->SetString( |
| 94 "manageProfilesExistingSupervisedUser", | 98 "manageProfilesExistingSupervisedUser", |
| 95 l10n_util::GetStringUTF16( | 99 l10n_util::GetStringUTF16( |
| 96 IDS_PROFILES_CREATE_LEGACY_SUPERVISED_USER_ERROR_EXISTS_REMOTELY)); | 100 IDS_PROFILES_CREATE_LEGACY_SUPERVISED_USER_ERROR_EXISTS_REMOTELY)); |
| 97 localized_strings->SetString( | 101 localized_strings->SetString( |
| 98 "managedProfilesExistingLocalSupervisedUser", | 102 "managedProfilesExistingLocalSupervisedUser", |
| 99 l10n_util::GetStringUTF16( | 103 l10n_util::GetStringUTF16( |
| 100 IDS_PROFILES_CREATE_LEGACY_SUPERVISED_USER_ERROR_EXISTS_LOCALLY)); | 104 IDS_PROFILES_CREATE_LEGACY_SUPERVISED_USER_ERROR_EXISTS_LOCALLY)); |
| 101 localized_strings->SetString( | 105 localized_strings->SetString( |
| 102 "custodianAccountNotSelectedError", | 106 "custodianAccountNotSelectedError", |
| 103 l10n_util::GetStringUTF16( | 107 l10n_util::GetStringUTF16( |
| (...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 733 Profile* profile = g_browser_process->profile_manager()-> | 737 Profile* profile = g_browser_process->profile_manager()-> |
| 734 GetProfileByPath(profile_file_path); | 738 GetProfileByPath(profile_file_path); |
| 735 DCHECK(profile); | 739 DCHECK(profile); |
| 736 | 740 |
| 737 profiles::FindOrCreateNewWindowForProfile( | 741 profiles::FindOrCreateNewWindowForProfile( |
| 738 profile, chrome::startup::IS_PROCESS_STARTUP, | 742 profile, chrome::startup::IS_PROCESS_STARTUP, |
| 739 chrome::startup::IS_FIRST_RUN, false); | 743 chrome::startup::IS_FIRST_RUN, false); |
| 740 } | 744 } |
| 741 | 745 |
| 742 #endif | 746 #endif |
| OLD | NEW |