diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-21 22:20:07 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-21 22:20:07 +0000 |
| commit | 321904b09d95548ef86c9a1b194142131d01be31 (patch) | |
| tree | e60197ff27d6b36244316e518f2219280f2065be | |
| parent | dd6cfa63b3bff8689ffbbc96fefe9375507597dc (diff) | |
| download | chromium_src-321904b09d95548ef86c9a1b194142131d01be31.zip chromium_src-321904b09d95548ef86c9a1b194142131d01be31.tar.gz chromium_src-321904b09d95548ef86c9a1b194142131d01be31.tar.bz2 | |
There may be no active browser when a lock request is received.
This can happen when chrome is starting and no browser window is active yet.
BUG=chromium-os:6802
TEST=BVT test should turn green.
Review URL: http://codereview.chromium.org/3455011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60114 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/login/screen_locker.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc index fef2b54..e466ba2 100644 --- a/chrome/browser/chromeos/login/screen_locker.cc +++ b/chrome/browser/chromeos/login/screen_locker.cc @@ -673,8 +673,9 @@ void ScreenLocker::Show() { // Exit fullscreen. Browser* browser = BrowserList::GetLastActive(); - DCHECK(browser); - if (browser->window()->IsFullscreen()) { + // browser can be NULL if we receive a lock request before the first browser + // window is shown. + if (browser && browser->window()->IsFullscreen()) { browser->ToggleFullscreenMode(); } |