| 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 <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
| (...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 391 return; | 391 return; |
| 392 | 392 |
| 393 if (login_host) | 393 if (login_host) |
| 394 login_host->SetStatusAreaVisible(true); | 394 login_host->SetStatusAreaVisible(true); |
| 395 | 395 |
| 396 BootTimesLoader::Get()->AddLoginTimeMarker("BrowserLaunched", false); | 396 BootTimesLoader::Get()->AddLoginTimeMarker("BrowserLaunched", false); |
| 397 | 397 |
| 398 VLOG(1) << "Launching browser..."; | 398 VLOG(1) << "Launching browser..."; |
| 399 StartupBrowserCreator browser_creator; | 399 StartupBrowserCreator browser_creator; |
| 400 int return_code; | 400 int return_code; |
| 401 browser::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ? | 401 chrome::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ? |
| 402 browser::startup::IS_FIRST_RUN : | 402 chrome::startup::IS_FIRST_RUN : chrome::startup::IS_NOT_FIRST_RUN; |
| 403 browser::startup::IS_NOT_FIRST_RUN; | |
| 404 browser_creator.LaunchBrowser(*CommandLine::ForCurrentProcess(), | 403 browser_creator.LaunchBrowser(*CommandLine::ForCurrentProcess(), |
| 405 profile, | 404 profile, |
| 406 FilePath(), | 405 FilePath(), |
| 407 browser::startup::IS_PROCESS_STARTUP, | 406 chrome::startup::IS_PROCESS_STARTUP, |
| 408 first_run, | 407 first_run, |
| 409 &return_code); | 408 &return_code); |
| 410 | 409 |
| 411 // Mark login host for deletion after browser starts. This | 410 // Mark login host for deletion after browser starts. This |
| 412 // guarantees that the message loop will be referenced by the | 411 // guarantees that the message loop will be referenced by the |
| 413 // browser before it is dereferenced by the login host. | 412 // browser before it is dereferenced by the login host. |
| 414 if (login_host) | 413 if (login_host) |
| 415 login_host->OnSessionStart(); | 414 login_host->OnSessionStart(); |
| 416 UserManager::Get()->SessionStarted(); | 415 UserManager::Get()->SessionStarted(); |
| 417 } | 416 } |
| (...skipping 704 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1122 bool LoginUtils::IsWhitelisted(const std::string& username) { | 1121 bool LoginUtils::IsWhitelisted(const std::string& username) { |
| 1123 CrosSettings* cros_settings = CrosSettings::Get(); | 1122 CrosSettings* cros_settings = CrosSettings::Get(); |
| 1124 bool allow_new_user = false; | 1123 bool allow_new_user = false; |
| 1125 cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user); | 1124 cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user); |
| 1126 if (allow_new_user) | 1125 if (allow_new_user) |
| 1127 return true; | 1126 return true; |
| 1128 return cros_settings->FindEmailInList(kAccountsPrefUsers, username); | 1127 return cros_settings->FindEmailInList(kAccountsPrefUsers, username); |
| 1129 } | 1128 } |
| 1130 | 1129 |
| 1131 } // namespace chromeos | 1130 } // namespace chromeos |
| OLD | NEW |