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/signin/user_manager_screen_handler.h" | 5 #include "chrome/browser/ui/webui/signin/user_manager_screen_handler.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
299 | 299 |
300 // TODO(mahmadi): Remove the following once prefs are cleared for everyone. | 300 // TODO(mahmadi): Remove the following once prefs are cleared for everyone. |
301 PrefService* service = g_browser_process->local_state(); | 301 PrefService* service = g_browser_process->local_state(); |
302 DCHECK(service); | 302 DCHECK(service); |
303 | 303 |
304 const PrefService::Preference* guest_mode_enabled_pref = | 304 const PrefService::Preference* guest_mode_enabled_pref = |
305 service->FindPreference(prefs::kBrowserGuestModeEnabled); | 305 service->FindPreference(prefs::kBrowserGuestModeEnabled); |
306 const PrefService::Preference* add_person_enabled_pref = | 306 const PrefService::Preference* add_person_enabled_pref = |
307 service->FindPreference(prefs::kBrowserAddPersonEnabled); | 307 service->FindPreference(prefs::kBrowserAddPersonEnabled); |
308 | 308 |
309 if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings) && | 309 if (guest_mode_enabled_pref->HasUserSetting() || |
310 (guest_mode_enabled_pref->HasUserSetting() || | 310 add_person_enabled_pref->HasUserSetting()) { |
311 add_person_enabled_pref->HasUserSetting())) { | |
312 service->ClearPref(guest_mode_enabled_pref->name()); | 311 service->ClearPref(guest_mode_enabled_pref->name()); |
313 service->ClearPref(add_person_enabled_pref->name()); | 312 service->ClearPref(add_person_enabled_pref->name()); |
314 base::RecordAction( | 313 base::RecordAction( |
315 base::UserMetricsAction("UserManager_Cleared_Legacy_User_Prefs")); | 314 base::UserMetricsAction("UserManager_Cleared_Legacy_User_Prefs")); |
316 } | 315 } |
317 } | 316 } |
318 | 317 |
319 UserManagerScreenHandler::~UserManagerScreenHandler() { | 318 UserManagerScreenHandler::~UserManagerScreenHandler() { |
320 proximity_auth::ScreenlockBridge::Get()->SetLockHandler(NULL); | 319 proximity_auth::ScreenlockBridge::Get()->SetLockHandler(NULL); |
321 } | 320 } |
(...skipping 734 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1056 Profile* profile, Profile::CreateStatus profile_create_status) { | 1055 Profile* profile, Profile::CreateStatus profile_create_status) { |
1057 Browser* browser = chrome::FindAnyBrowser(profile, false); | 1056 Browser* browser = chrome::FindAnyBrowser(profile, false); |
1058 if (browser && browser->window()) { | 1057 if (browser && browser->window()) { |
1059 OnBrowserWindowReady(browser); | 1058 OnBrowserWindowReady(browser); |
1060 } else { | 1059 } else { |
1061 registrar_.Add(this, | 1060 registrar_.Add(this, |
1062 chrome::NOTIFICATION_BROWSER_WINDOW_READY, | 1061 chrome::NOTIFICATION_BROWSER_WINDOW_READY, |
1063 content::NotificationService::AllSources()); | 1062 content::NotificationService::AllSources()); |
1064 } | 1063 } |
1065 } | 1064 } |
OLD | NEW |