diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-02 22:16:39 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-02 22:16:39 +0000 |
| commit | 4f5193277bb84f43d0fbafb42e1442ac77ad47c3 (patch) | |
| tree | 3c36cd664b7086cec8cd2e7b37cec8cfeb0d327c /chrome/browser/browser_main.cc | |
| parent | 516650c2b70d0e2e14fcf0c284e22bc57ad53179 (diff) | |
| download | chromium_src-4f5193277bb84f43d0fbafb42e1442ac77ad47c3.zip chromium_src-4f5193277bb84f43d0fbafb42e1442ac77ad47c3.tar.gz chromium_src-4f5193277bb84f43d0fbafb42e1442ac77ad47c3.tar.bz2 | |
Initialize screen locker before letting user logged in.
Retry up to 30 seconds (1 sec x 30) even if it fails to grab inputs.
BUG=none
TEST=manual: scree lock should work after chrome crash.
Review URL: http://codereview.chromium.org/2458002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48776 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 34e945d..2d47ccf4 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -615,7 +615,6 @@ void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line) { } browser::ShowLoginWizard(first_screen, size); } - chromeos::ScreenLocker::InitClass(); } #else void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line) { @@ -1041,6 +1040,10 @@ int BrowserMain(const MainFunctionParams& parameters) { // Profile creation ---------------------------------------------------------- #if defined(OS_CHROMEOS) + // Initialize the screen locker now so that it can receive + // LOGIN_USER_CHANGED notification from UserManager. + chromeos::ScreenLocker::InitClass(); + // This forces the ProfileManager to be created and register for the // notification it needs to track the logged in user. g_browser_process->profile_manager()->GetDefaultProfile(); |