| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/options/create_profile_handler.h" | 5 #include "chrome/browser/ui/webui/options/create_profile_handler.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 211 // the new window now. | 211 // the new window now. |
| 212 bool should_open_new_window = true; | 212 bool should_open_new_window = true; |
| 213 #if BUILDFLAG(ENABLE_SUPERVISED_USERS) | 213 #if BUILDFLAG(ENABLE_SUPERVISED_USERS) |
| 214 if (profile_creation_type_ == SUPERVISED_PROFILE_CREATION) | 214 if (profile_creation_type_ == SUPERVISED_PROFILE_CREATION) |
| 215 should_open_new_window = false; | 215 should_open_new_window = false; |
| 216 #endif | 216 #endif |
| 217 | 217 |
| 218 if (should_open_new_window) { | 218 if (should_open_new_window) { |
| 219 // Opening the new window must be the last action, after all callbacks | 219 // Opening the new window must be the last action, after all callbacks |
| 220 // have been run, to give them a chance to initialize the profile. | 220 // have been run, to give them a chance to initialize the profile. |
| 221 webui::OpenNewWindowForProfile(profile, Profile::CREATE_STATUS_INITIALIZED); | 221 webui::OpenNewWindowForProfile(profile); |
| 222 } | 222 } |
| 223 profile_creation_type_ = NO_CREATION_IN_PROGRESS; | 223 profile_creation_type_ = NO_CREATION_IN_PROGRESS; |
| 224 } | 224 } |
| 225 | 225 |
| 226 void CreateProfileHandler::ShowProfileCreationError( | 226 void CreateProfileHandler::ShowProfileCreationError( |
| 227 Profile* profile, | 227 Profile* profile, |
| 228 const base::string16& error) { | 228 const base::string16& error) { |
| 229 DCHECK_NE(NO_CREATION_IN_PROGRESS, profile_creation_type_); | 229 DCHECK_NE(NO_CREATION_IN_PROGRESS, profile_creation_type_); |
| 230 profile_creation_type_ = NO_CREATION_IN_PROGRESS; | 230 profile_creation_type_ = NO_CREATION_IN_PROGRESS; |
| 231 profile_path_being_created_.clear(); | 231 profile_path_being_created_.clear(); |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 475 GetProfileAttributesStorage().GetAllProfilesAttributes(); | 475 GetProfileAttributesStorage().GetAllProfilesAttributes(); |
| 476 for (const ProfileAttributesEntry* entry : entries) { | 476 for (const ProfileAttributesEntry* entry : entries) { |
| 477 if (existing_supervised_user_id == entry->GetSupervisedUserId()) | 477 if (existing_supervised_user_id == entry->GetSupervisedUserId()) |
| 478 return false; | 478 return false; |
| 479 } | 479 } |
| 480 return true; | 480 return true; |
| 481 } | 481 } |
| 482 #endif | 482 #endif |
| 483 | 483 |
| 484 } // namespace options | 484 } // namespace options |
| OLD | NEW |