| 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 "ash/ash_switches.h" | 9 #include "ash/ash_switches.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 #include "chrome/browser/chromeos/cros_settings.h" | 32 #include "chrome/browser/chromeos/cros_settings.h" |
| 33 #include "chrome/browser/chromeos/cros_settings_names.h" | 33 #include "chrome/browser/chromeos/cros_settings_names.h" |
| 34 #include "chrome/browser/chromeos/input_method/input_method_manager.h" | 34 #include "chrome/browser/chromeos/input_method/input_method_manager.h" |
| 35 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 35 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
| 36 #include "chrome/browser/chromeos/login/language_switch_menu.h" | 36 #include "chrome/browser/chromeos/login/language_switch_menu.h" |
| 37 #include "chrome/browser/chromeos/login/login_display_host.h" | 37 #include "chrome/browser/chromeos/login/login_display_host.h" |
| 38 #include "chrome/browser/chromeos/login/ownership_service.h" | 38 #include "chrome/browser/chromeos/login/ownership_service.h" |
| 39 #include "chrome/browser/chromeos/login/parallel_authenticator.h" | 39 #include "chrome/browser/chromeos/login/parallel_authenticator.h" |
| 40 #include "chrome/browser/chromeos/login/screen_locker.h" | 40 #include "chrome/browser/chromeos/login/screen_locker.h" |
| 41 #include "chrome/browser/chromeos/login/user_manager.h" | 41 #include "chrome/browser/chromeos/login/user_manager.h" |
| 42 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h" | |
| 43 #include "chrome/browser/extensions/extension_service.h" | 42 #include "chrome/browser/extensions/extension_service.h" |
| 44 #include "chrome/browser/first_run/first_run.h" | 43 #include "chrome/browser/first_run/first_run.h" |
| 45 #include "chrome/browser/net/chrome_url_request_context.h" | 44 #include "chrome/browser/net/chrome_url_request_context.h" |
| 46 #include "chrome/browser/net/gaia/gaia_oauth_consumer.h" | 45 #include "chrome/browser/net/gaia/gaia_oauth_consumer.h" |
| 47 #include "chrome/browser/net/gaia/gaia_oauth_fetcher.h" | 46 #include "chrome/browser/net/gaia/gaia_oauth_fetcher.h" |
| 48 #include "chrome/browser/net/preconnect.h" | 47 #include "chrome/browser/net/preconnect.h" |
| 49 #include "chrome/browser/policy/browser_policy_connector.h" | 48 #include "chrome/browser/policy/browser_policy_connector.h" |
| 50 #include "chrome/browser/prefs/pref_member.h" | 49 #include "chrome/browser/prefs/pref_member.h" |
| 51 #include "chrome/browser/profiles/profile.h" | 50 #include "chrome/browser/profiles/profile.h" |
| 52 #include "chrome/browser/profiles/profile_manager.h" | 51 #include "chrome/browser/profiles/profile_manager.h" |
| (...skipping 646 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 699 scoped_ptr<LoginUtils> ptr_; | 698 scoped_ptr<LoginUtils> ptr_; |
| 700 | 699 |
| 701 DISALLOW_COPY_AND_ASSIGN(LoginUtilsWrapper); | 700 DISALLOW_COPY_AND_ASSIGN(LoginUtilsWrapper); |
| 702 }; | 701 }; |
| 703 | 702 |
| 704 void LoginUtilsImpl::DoBrowserLaunch(Profile* profile, | 703 void LoginUtilsImpl::DoBrowserLaunch(Profile* profile, |
| 705 LoginDisplayHost* login_host) { | 704 LoginDisplayHost* login_host) { |
| 706 if (browser_shutdown::IsTryingToQuit()) | 705 if (browser_shutdown::IsTryingToQuit()) |
| 707 return; | 706 return; |
| 708 | 707 |
| 709 StatusAreaViewChromeos::SetScreenMode(StatusAreaViewChromeos::BROWSER_MODE); | 708 if (login_host) |
| 710 if (login_host) { | |
| 711 // Enable status area now as the login window may be destructed anytime | |
| 712 // after LaunchBrowser. | |
| 713 login_host->SetStatusAreaVisible(true); | 709 login_host->SetStatusAreaVisible(true); |
| 714 login_host->SetStatusAreaEnabled(true); | |
| 715 } | |
| 716 | 710 |
| 717 BootTimesLoader::Get()->AddLoginTimeMarker("BrowserLaunched", false); | 711 BootTimesLoader::Get()->AddLoginTimeMarker("BrowserLaunched", false); |
| 718 | 712 |
| 719 VLOG(1) << "Launching browser..."; | 713 VLOG(1) << "Launching browser..."; |
| 720 BrowserInit browser_init; | 714 BrowserInit browser_init; |
| 721 int return_code; | 715 int return_code; |
| 722 BrowserInit::IsFirstRun first_run = first_run::IsChromeFirstRun() ? | 716 BrowserInit::IsFirstRun first_run = first_run::IsChromeFirstRun() ? |
| 723 BrowserInit::IS_FIRST_RUN: BrowserInit::IS_NOT_FIRST_RUN; | 717 BrowserInit::IS_FIRST_RUN: BrowserInit::IS_NOT_FIRST_RUN; |
| 724 browser_init.LaunchBrowser(*CommandLine::ForCurrentProcess(), | 718 browser_init.LaunchBrowser(*CommandLine::ForCurrentProcess(), |
| 725 profile, | 719 profile, |
| (...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1063 switches::kLoginProfile, | 1057 switches::kLoginProfile, |
| 1064 switches::kScrollPixels, | 1058 switches::kScrollPixels, |
| 1065 switches::kNoFirstRun, | 1059 switches::kNoFirstRun, |
| 1066 switches::kPpapiFlashArgs, | 1060 switches::kPpapiFlashArgs, |
| 1067 switches::kPpapiFlashInProcess, | 1061 switches::kPpapiFlashInProcess, |
| 1068 switches::kPpapiFlashPath, | 1062 switches::kPpapiFlashPath, |
| 1069 switches::kPpapiFlashVersion, | 1063 switches::kPpapiFlashVersion, |
| 1070 switches::kFlingTapSuppressMaxDown, | 1064 switches::kFlingTapSuppressMaxDown, |
| 1071 switches::kFlingTapSuppressMaxGap, | 1065 switches::kFlingTapSuppressMaxGap, |
| 1072 switches::kTouchDevices, | 1066 switches::kTouchDevices, |
| 1073 ash::switches::kDisableAshUberTray, | |
| 1074 ash::switches::kAuraLegacyPowerButton, | 1067 ash::switches::kAuraLegacyPowerButton, |
| 1075 ash::switches::kAuraNoShadows, | 1068 ash::switches::kAuraNoShadows, |
| 1076 ash::switches::kAuraPanelManager, | 1069 ash::switches::kAuraPanelManager, |
| 1077 ash::switches::kAuraWindowAnimationsDisabled, | 1070 ash::switches::kAuraWindowAnimationsDisabled, |
| 1078 switches::kUIEnablePartialSwap, | 1071 switches::kUIEnablePartialSwap, |
| 1079 switches::kUIUseGPUProcess, | 1072 switches::kUIUseGPUProcess, |
| 1080 switches::kUseGL, | 1073 switches::kUseGL, |
| 1081 switches::kUserDataDir, | 1074 switches::kUserDataDir, |
| 1082 #if defined(USE_VIRTUAL_KEYBOARD) | 1075 #if defined(USE_VIRTUAL_KEYBOARD) |
| 1083 // The virtual keyboard extension (chrome://keyboard) highly relies on | 1076 // The virtual keyboard extension (chrome://keyboard) highly relies on |
| (...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1449 bool LoginUtils::IsWhitelisted(const std::string& username) { | 1442 bool LoginUtils::IsWhitelisted(const std::string& username) { |
| 1450 CrosSettings* cros_settings = CrosSettings::Get(); | 1443 CrosSettings* cros_settings = CrosSettings::Get(); |
| 1451 bool allow_new_user = false; | 1444 bool allow_new_user = false; |
| 1452 cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user); | 1445 cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user); |
| 1453 if (allow_new_user) | 1446 if (allow_new_user) |
| 1454 return true; | 1447 return true; |
| 1455 return cros_settings->FindEmailInList(kAccountsPrefUsers, username); | 1448 return cros_settings->FindEmailInList(kAccountsPrefUsers, username); |
| 1456 } | 1449 } |
| 1457 | 1450 |
| 1458 } // namespace chromeos | 1451 } // namespace chromeos |
| OLD | NEW |