Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(195)

Side by Side Diff: ash/system/web_notification/ash_popup_alignment_delegate.cc

Issue 740133002: Updates the shelf reference before handling display metrics change. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/system/web_notification/ash_popup_alignment_delegate.h" 5 #include "ash/system/web_notification/ash_popup_alignment_delegate.h"
6 6
7 #include "ash/display/display_controller.h" 7 #include "ash/display/display_controller.h"
8 #include "ash/shelf/shelf_constants.h" 8 #include "ash/shelf/shelf_constants.h"
9 #include "ash/shelf/shelf_layout_manager.h" 9 #include "ash/shelf/shelf_layout_manager.h"
10 #include "ash/shelf/shelf_types.h" 10 #include "ash/shelf/shelf_types.h"
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 const gfx::Display& new_display) { 163 const gfx::Display& new_display) {
164 } 164 }
165 165
166 void AshPopupAlignmentDelegate::OnDisplayRemoved( 166 void AshPopupAlignmentDelegate::OnDisplayRemoved(
167 const gfx::Display& old_display) { 167 const gfx::Display& old_display) {
168 } 168 }
169 169
170 void AshPopupAlignmentDelegate::OnDisplayMetricsChanged( 170 void AshPopupAlignmentDelegate::OnDisplayMetricsChanged(
171 const gfx::Display& display, 171 const gfx::Display& display,
172 uint32_t metrics) { 172 uint32_t metrics) {
173 UpdateShelf();
173 if (display.id() == display_id_ && shelf_) 174 if (display.id() == display_id_ && shelf_)
174 OnAutoHideStateChanged(shelf_->auto_hide_state()); 175 OnAutoHideStateChanged(shelf_->auto_hide_state());
175 } 176 }
176 177
177 } // namespace ash 178 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698