diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-16 15:55:27 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-16 15:55:27 +0000 |
| commit | 1bb802e95fa71eab968bc40df5c1d2d2df54b59e (patch) | |
| tree | 2de7179e5b82f47615d0ebfbcaeb3988f02ef9f0 | |
| parent | 3fc18b62c4966193eb435baabe2d18a3810ec82e (diff) | |
| download | chromium_src-1bb802e95fa71eab968bc40df5c1d2d2df54b59e.zip chromium_src-1bb802e95fa71eab968bc40df5c1d2d2df54b59e.tar.gz chromium_src-1bb802e95fa71eab968bc40df5c1d2d2df54b59e.tar.bz2 | |
Do not preload auth extension on lock screen.
BUG=chromium-os:25018
TEST=Lock screen, observe log and see that gaia frame is not preloaded.
Review URL: http://codereview.chromium.org/9174005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117854 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc index ef86fb1..bdb4a92 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -726,7 +726,11 @@ void SigninScreenHandler::HandleAccountPickerReady( const base::ListValue* args) { // Fetching of the extension is not started before account picker page is // loaded because it can affect the loading speed. - if (is_first_attempt_ && !cookie_remover_ && !dns_clear_task_running_) + // Do not load the extension for the screen locker, see crosbug.com/25018. + if (!ScreenLocker::default_screen_locker() && + is_first_attempt_ && + !cookie_remover_ && + !dns_clear_task_running_) LoadAuthExtension(true, true); if (ScreenLocker::default_screen_locker()) { |