diff options
| author | reveman <reveman@chromium.org> | 2016-03-22 15:11:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-22 22:13:14 +0000 |
| commit | 799324ac96cb110489e0b58e367615779a256095 (patch) | |
| tree | 36801ed2cf573c72aaf8da83e6f2d161983b9412 /components | |
| parent | 63ef43c0af90ca5f23d0606e2394b0e5f25fc0b5 (diff) | |
| download | chromium_src-799324ac96cb110489e0b58e367615779a256095.zip chromium_src-799324ac96cb110489e0b58e367615779a256095.tar.gz chromium_src-799324ac96cb110489e0b58e367615779a256095.tar.bz2 | |
exo: Fix DCHECK in ShellSurface::OnWindowActivated.
This DCHECK is only valid if gained_active or lost_active
equals the native window.
BUG=549781
TEST=exo_unittests
TBR=dcastagna@chromium.org
Review URL: https://codereview.chromium.org/1823913004
Cr-Commit-Position: refs/heads/master@{#382705}
Diffstat (limited to 'components')
| -rw-r--r-- | components/exo/shell_surface.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/components/exo/shell_surface.cc b/components/exo/shell_surface.cc index 72e3085..1047197 100644 --- a/components/exo/shell_surface.cc +++ b/components/exo/shell_surface.cc @@ -403,13 +403,12 @@ void ShellSurface::OnWindowActivated( aura::client::ActivationChangeObserver::ActivationReason reason, aura::Window* gained_active, aura::Window* lost_active) { - DCHECK(activatable_); - if (!widget_) return; if (gained_active == widget_->GetNativeWindow() || lost_active == widget_->GetNativeWindow()) { + DCHECK(activatable_); Configure(); } } |