| 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 "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "chrome/browser/browser_process.h" | 6 #include "chrome/browser/browser_process.h" |
| 7 #include "chrome/browser/profiles/profile_manager.h" | 7 #include "chrome/browser/profiles/profile_manager.h" |
| 8 #include "chrome/browser/profiles/profile_metrics.h" | 8 #include "chrome/browser/profiles/profile_metrics.h" |
| 9 #include "chrome/browser/profiles/profile_window.h" | 9 #include "chrome/browser/profiles/profile_window.h" |
| 10 #include "chrome/browser/profiles/profiles_state.h" | 10 #include "chrome/browser/profiles/profiles_state.h" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 profiles::FindOrCreateNewWindowForProfile( | 44 profiles::FindOrCreateNewWindowForProfile( |
| 45 profile, | 45 profile, |
| 46 chrome::startup::IS_PROCESS_STARTUP, | 46 chrome::startup::IS_PROCESS_STARTUP, |
| 47 chrome::startup::IS_FIRST_RUN, | 47 chrome::startup::IS_FIRST_RUN, |
| 48 desktop_type, | 48 desktop_type, |
| 49 false); | 49 false); |
| 50 } | 50 } |
| 51 | 51 |
| 52 void DeleteProfileAtPath(base::FilePath file_path, content::WebUI* web_ui) { | 52 void DeleteProfileAtPath(base::FilePath file_path, content::WebUI* web_ui) { |
| 53 DCHECK(web_ui); | 53 DCHECK(web_ui); |
| 54 // This handler could have been called for a supervised user, for example | |
| 55 // because the user fiddled with the web inspector. Silently return in this | |
| 56 // case. | |
| 57 if (Profile::FromWebUI(web_ui)->IsSupervised()) | |
| 58 return; | |
| 59 | 54 |
| 60 if (!profiles::IsMultipleProfilesEnabled()) | 55 if (!profiles::IsMultipleProfilesEnabled()) |
| 61 return; | 56 return; |
| 62 | 57 |
| 63 ProfileMetrics::LogProfileDeleteUser(ProfileMetrics::DELETE_PROFILE_SETTINGS); | 58 ProfileMetrics::LogProfileDeleteUser(ProfileMetrics::DELETE_PROFILE_SETTINGS); |
| 64 | 59 |
| 65 g_browser_process->profile_manager()->ScheduleProfileForDeletion( | 60 g_browser_process->profile_manager()->ScheduleProfileForDeletion( |
| 66 file_path, | 61 file_path, |
| 67 base::Bind(&OpenNewWindowForProfile, GetDesktopType(web_ui))); | 62 base::Bind(&OpenNewWindowForProfile, GetDesktopType(web_ui))); |
| 68 } | 63 } |
| 69 | 64 |
| 70 } // namespace helper | 65 } // namespace helper |
| 71 } // namespace options | 66 } // namespace options |
| OLD | NEW |