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 <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 1328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1339 } | 1339 } |
1340 | 1340 |
1341 // static | 1341 // static |
1342 void LoginUtils::DoBrowserLaunch(Profile* profile, | 1342 void LoginUtils::DoBrowserLaunch(Profile* profile, |
1343 LoginDisplayHost* login_host) { | 1343 LoginDisplayHost* login_host) { |
1344 if (browser_shutdown::IsTryingToQuit()) | 1344 if (browser_shutdown::IsTryingToQuit()) |
1345 return; | 1345 return; |
1346 | 1346 |
1347 StatusAreaViewChromeos::SetScreenMode(StatusAreaViewChromeos::BROWSER_MODE); | 1347 StatusAreaViewChromeos::SetScreenMode(StatusAreaViewChromeos::BROWSER_MODE); |
1348 if (login_host) { | 1348 if (login_host) { |
| 1349 // Enable status area now as the login window may be destructed anytime |
| 1350 // after LaunchBrowser. |
1349 login_host->SetStatusAreaVisible(true); | 1351 login_host->SetStatusAreaVisible(true); |
1350 login_host->SetStatusAreaEnabled(true); | 1352 login_host->SetStatusAreaEnabled(true); |
1351 #if defined(USE_AURA) | |
1352 // Close lock window now so that the launched browser can receive focus. | |
1353 // TODO(oshima): Implement hide animation for lock screens. | |
1354 login_host->CloseWindow(); | |
1355 #endif | |
1356 } | 1353 } |
1357 | 1354 |
1358 BootTimesLoader::Get()->AddLoginTimeMarker("BrowserLaunched", false); | 1355 BootTimesLoader::Get()->AddLoginTimeMarker("BrowserLaunched", false); |
1359 | 1356 |
1360 VLOG(1) << "Launching browser..."; | 1357 VLOG(1) << "Launching browser..."; |
1361 BrowserInit browser_init; | 1358 BrowserInit browser_init; |
1362 int return_code; | 1359 int return_code; |
1363 BrowserInit::IsFirstRun first_run = first_run::IsChromeFirstRun() ? | 1360 BrowserInit::IsFirstRun first_run = first_run::IsChromeFirstRun() ? |
1364 BrowserInit::IS_FIRST_RUN: BrowserInit::IS_NOT_FIRST_RUN; | 1361 BrowserInit::IS_FIRST_RUN: BrowserInit::IS_NOT_FIRST_RUN; |
1365 browser_init.LaunchBrowser(*CommandLine::ForCurrentProcess(), | 1362 browser_init.LaunchBrowser(*CommandLine::ForCurrentProcess(), |
(...skipping 19 matching lines...) Expand all Loading... |
1385 bool LoginUtils::IsWhitelisted(const std::string& username) { | 1382 bool LoginUtils::IsWhitelisted(const std::string& username) { |
1386 CrosSettings* cros_settings = CrosSettings::Get(); | 1383 CrosSettings* cros_settings = CrosSettings::Get(); |
1387 bool allow_new_user = false; | 1384 bool allow_new_user = false; |
1388 cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user); | 1385 cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user); |
1389 if (allow_new_user) | 1386 if (allow_new_user) |
1390 return true; | 1387 return true; |
1391 return cros_settings->FindEmailInList(kAccountsPrefUsers, username); | 1388 return cros_settings->FindEmailInList(kAccountsPrefUsers, username); |
1392 } | 1389 } |
1393 | 1390 |
1394 } // namespace chromeos | 1391 } // namespace chromeos |
OLD | NEW |