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

Unified Diff: ash/common/system/tray/system_tray.cc

Issue 2804523002: Fix mistmached |GetDisplayNearest{Window,View}| param type (Closed)
Patch Set: window Created 3 years, 8 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/common/wm/window_cycle_list.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/system_tray.cc
diff --git a/ash/common/system/tray/system_tray.cc b/ash/common/system/tray/system_tray.cc
index 79d76338186a00944900a96e6df48c9155cfeb2b..1ea3a410d798cd30978756609692613c531646f2 100644
--- a/ash/common/system/tray/system_tray.cc
+++ b/ash/common/system/tray/system_tray.cc
@@ -548,10 +548,10 @@ void SystemTray::UpdateWebNotifications() {
int height = 0;
if (bubble_view) {
- gfx::Rect work_area =
- display::Screen::GetScreen()
- ->GetDisplayNearestWindow(bubble_view->GetWidget()->GetNativeView())
- .work_area();
+ gfx::Rect work_area = display::Screen::GetScreen()
+ ->GetDisplayNearestWindow(
+ bubble_view->GetWidget()->GetNativeWindow())
+ .work_area();
height =
std::max(0, work_area.bottom() - bubble_view->GetBoundsInScreen().y());
}
@@ -749,7 +749,7 @@ void SystemTray::RecordSystemMenuMetrics() {
int work_area_height =
display::Screen::GetScreen()
- ->GetDisplayNearestWindow(bubble_view->GetWidget()->GetNativeView())
+ ->GetDisplayNearestWindow(bubble_view->GetWidget()->GetNativeWindow())
.work_area()
.height();
if (work_area_height > 0) {
« no previous file with comments | « no previous file | ash/common/wm/window_cycle_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698