summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authormukai <mukai@chromium.org>2014-11-20 11:39:02 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-20 19:39:39 +0000
commitaa1f1a0e41ce8e9e6e40bbd28d1b80de68431553 (patch)
tree095913583d3a2f14ba518974b33f72b1478f245e /ash
parenta7f80b66a74e9d4be407e1a61c090e3946f6b161 (diff)
downloadchromium_src-aa1f1a0e41ce8e9e6e40bbd28d1b80de68431553.zip
chromium_src-aa1f1a0e41ce8e9e6e40bbd28d1b80de68431553.tar.gz
chromium_src-aa1f1a0e41ce8e9e6e40bbd28d1b80de68431553.tar.bz2
Updates the shelf reference before handling display metrics change.
Sometimes OnDisplayMetricsChanged() may be called before shelf_ is set properly. BUG=389171 R=stevenjb@chromium.org TEST=manually Review URL: https://codereview.chromium.org/740133002 Cr-Commit-Position: refs/heads/master@{#305063}
Diffstat (limited to 'ash')
-rw-r--r--ash/system/web_notification/ash_popup_alignment_delegate.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/ash/system/web_notification/ash_popup_alignment_delegate.cc b/ash/system/web_notification/ash_popup_alignment_delegate.cc
index a81b0e1..4ad9f60 100644
--- a/ash/system/web_notification/ash_popup_alignment_delegate.cc
+++ b/ash/system/web_notification/ash_popup_alignment_delegate.cc
@@ -170,6 +170,7 @@ void AshPopupAlignmentDelegate::OnDisplayRemoved(
void AshPopupAlignmentDelegate::OnDisplayMetricsChanged(
const gfx::Display& display,
uint32_t metrics) {
+ UpdateShelf();
if (display.id() == display_id_ && shelf_)
OnAutoHideStateChanged(shelf_->auto_hide_state());
}