OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/chromeos/login/login_utils.h" | 5 #include "chrome/browser/chromeos/login/login_utils.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <set> | 8 #include <set> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 #include "chrome/browser/chromeos/login/profile_auth_data.h" | 42 #include "chrome/browser/chromeos/login/profile_auth_data.h" |
43 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" | 43 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" |
44 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory
.h" | 44 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory
.h" |
45 #include "chrome/browser/chromeos/login/session/user_session_manager.h" | 45 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
46 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h" | 46 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h" |
47 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h" | 47 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h" |
48 #include "chrome/browser/chromeos/login/startup_utils.h" | 48 #include "chrome/browser/chromeos/login/startup_utils.h" |
49 #include "chrome/browser/chromeos/login/ui/input_events_blocker.h" | 49 #include "chrome/browser/chromeos/login/ui/input_events_blocker.h" |
50 #include "chrome/browser/chromeos/login/ui/login_display_host.h" | 50 #include "chrome/browser/chromeos/login/ui/login_display_host.h" |
51 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" | 51 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" |
52 #include "chrome/browser/chromeos/login/users/user.h" | |
53 #include "chrome/browser/chromeos/login/users/user_manager.h" | 52 #include "chrome/browser/chromeos/login/users/user_manager.h" |
54 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 53 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
55 #include "chrome/browser/chromeos/settings/cros_settings.h" | 54 #include "chrome/browser/chromeos/settings/cros_settings.h" |
56 #include "chrome/browser/extensions/extension_service.h" | 55 #include "chrome/browser/extensions/extension_service.h" |
57 #include "chrome/browser/first_run/first_run.h" | 56 #include "chrome/browser/first_run/first_run.h" |
58 #include "chrome/browser/google/google_brand_chromeos.h" | 57 #include "chrome/browser/google/google_brand_chromeos.h" |
59 #include "chrome/browser/lifetime/application_lifetime.h" | 58 #include "chrome/browser/lifetime/application_lifetime.h" |
60 #include "chrome/browser/pref_service_flags_storage.h" | 59 #include "chrome/browser/pref_service_flags_storage.h" |
61 #include "chrome/browser/profiles/profile.h" | 60 #include "chrome/browser/profiles/profile.h" |
62 #include "chrome/browser/profiles/profile_manager.h" | 61 #include "chrome/browser/profiles/profile_manager.h" |
63 #include "chrome/browser/rlz/rlz.h" | 62 #include "chrome/browser/rlz/rlz.h" |
64 #include "chrome/browser/signin/signin_manager_factory.h" | 63 #include "chrome/browser/signin/signin_manager_factory.h" |
65 #include "chrome/browser/sync/profile_sync_service.h" | 64 #include "chrome/browser/sync/profile_sync_service.h" |
66 #include "chrome/browser/sync/profile_sync_service_factory.h" | 65 #include "chrome/browser/sync/profile_sync_service_factory.h" |
67 #include "chrome/browser/ui/app_list/start_page_service.h" | 66 #include "chrome/browser/ui/app_list/start_page_service.h" |
68 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 67 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
69 #include "chrome/common/chrome_switches.h" | 68 #include "chrome/common/chrome_switches.h" |
70 #include "chrome/common/logging_chrome.h" | 69 #include "chrome/common/logging_chrome.h" |
71 #include "chrome/common/pref_names.h" | 70 #include "chrome/common/pref_names.h" |
72 #include "chromeos/chromeos_switches.h" | 71 #include "chromeos/chromeos_switches.h" |
73 #include "chromeos/cryptohome/cryptohome_util.h" | 72 #include "chromeos/cryptohome/cryptohome_util.h" |
74 #include "chromeos/dbus/cryptohome_client.h" | 73 #include "chromeos/dbus/cryptohome_client.h" |
75 #include "chromeos/dbus/dbus_method_call_status.h" | 74 #include "chromeos/dbus/dbus_method_call_status.h" |
76 #include "chromeos/dbus/dbus_thread_manager.h" | 75 #include "chromeos/dbus/dbus_thread_manager.h" |
77 #include "chromeos/dbus/session_manager_client.h" | 76 #include "chromeos/dbus/session_manager_client.h" |
78 #include "chromeos/login/auth/user_context.h" | 77 #include "chromeos/login/auth/user_context.h" |
79 #include "chromeos/settings/cros_settings_names.h" | 78 #include "chromeos/settings/cros_settings_names.h" |
80 #include "components/signin/core/browser/signin_manager.h" | 79 #include "components/signin/core/browser/signin_manager.h" |
| 80 #include "components/user_manager/user.h" |
81 #include "content/public/browser/browser_thread.h" | 81 #include "content/public/browser/browser_thread.h" |
82 #include "content/public/browser/notification_service.h" | 82 #include "content/public/browser/notification_service.h" |
83 #include "google_apis/gaia/gaia_auth_consumer.h" | 83 #include "google_apis/gaia/gaia_auth_consumer.h" |
84 #include "net/base/network_change_notifier.h" | 84 #include "net/base/network_change_notifier.h" |
85 #include "net/url_request/url_request_context.h" | 85 #include "net/url_request/url_request_context.h" |
86 #include "net/url_request/url_request_context_getter.h" | 86 #include "net/url_request/url_request_context_getter.h" |
87 #include "url/gurl.h" | 87 #include "url/gurl.h" |
88 | 88 |
89 using content::BrowserThread; | 89 using content::BrowserThread; |
90 | 90 |
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
302 UserManager::Get()->SessionStarted(); | 302 UserManager::Get()->SessionStarted(); |
303 chromeos::BootTimesLoader::Get()->LoginDone( | 303 chromeos::BootTimesLoader::Get()->LoginDone( |
304 chromeos::UserManager::Get()->IsCurrentUserNew()); | 304 chromeos::UserManager::Get()->IsCurrentUserNew()); |
305 } | 305 } |
306 | 306 |
307 void LoginUtilsImpl::DoBrowserLaunch(Profile* profile, | 307 void LoginUtilsImpl::DoBrowserLaunch(Profile* profile, |
308 LoginDisplayHost* login_host) { | 308 LoginDisplayHost* login_host) { |
309 if (browser_shutdown::IsTryingToQuit()) | 309 if (browser_shutdown::IsTryingToQuit()) |
310 return; | 310 return; |
311 | 311 |
312 User* const user = ProfileHelper::Get()->GetUserByProfile(profile); | 312 user_manager::User* const user = |
| 313 ProfileHelper::Get()->GetUserByProfile(profile); |
313 scoped_ptr<DoBrowserLaunchOnLocaleLoadedData> data( | 314 scoped_ptr<DoBrowserLaunchOnLocaleLoadedData> data( |
314 new DoBrowserLaunchOnLocaleLoadedData(this, profile, login_host)); | 315 new DoBrowserLaunchOnLocaleLoadedData(this, profile, login_host)); |
315 | 316 |
316 scoped_ptr<locale_util::SwitchLanguageCallback> callback( | 317 scoped_ptr<locale_util::SwitchLanguageCallback> callback( |
317 new locale_util::SwitchLanguageCallback( | 318 new locale_util::SwitchLanguageCallback( |
318 base::Bind(&LoginUtilsImpl::DoBrowserLaunchOnLocaleLoaded, | 319 base::Bind(&LoginUtilsImpl::DoBrowserLaunchOnLocaleLoaded, |
319 base::Passed(data.Pass())))); | 320 base::Passed(data.Pass())))); |
320 if (!UserSessionManager::GetInstance()-> | 321 if (!UserSessionManager::GetInstance()-> |
321 RespectLocalePreference(profile, user, callback.Pass())) { | 322 RespectLocalePreference(profile, user, callback.Pass())) { |
322 DoBrowserLaunchOnLocaleLoadedImpl(profile, login_host); | 323 DoBrowserLaunchOnLocaleLoadedImpl(profile, login_host); |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
458 CrosSettings* cros_settings = CrosSettings::Get(); | 459 CrosSettings* cros_settings = CrosSettings::Get(); |
459 bool allow_new_user = false; | 460 bool allow_new_user = false; |
460 cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user); | 461 cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user); |
461 if (allow_new_user) | 462 if (allow_new_user) |
462 return true; | 463 return true; |
463 return cros_settings->FindEmailInList( | 464 return cros_settings->FindEmailInList( |
464 kAccountsPrefUsers, username, wildcard_match); | 465 kAccountsPrefUsers, username, wildcard_match); |
465 } | 466 } |
466 | 467 |
467 } // namespace chromeos | 468 } // namespace chromeos |
OLD | NEW |