diff options
Diffstat (limited to 'ash/system/tray')
| -rw-r--r-- | ash/system/tray/tray_background_view.cc | 4 | ||||
| -rw-r--r-- | ash/system/tray/tray_event_filter.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc index b106122..f357706 100644 --- a/ash/system/tray/tray_background_view.cc +++ b/ash/system/tray/tray_background_view.cc @@ -573,7 +573,7 @@ gfx::Rect TrayBackgroundView::GetBubbleAnchorRect( // TODO(jennyz): May need to add left/right alignment in the following code. if (rect.IsEmpty()) { - aura::RootWindow* target_root = anchor_widget ? + aura::Window* target_root = anchor_widget ? anchor_widget->GetNativeView()->GetRootWindow() : Shell::GetPrimaryRootWindow(); rect = target_root->bounds(); @@ -622,7 +622,7 @@ void TrayBackgroundView::UpdateBubbleViewArrow( if (switches::UseAlternateShelfLayout()) return; - aura::RootWindow* root_window = + aura::Window* root_window = bubble_view->GetWidget()->GetNativeView()->GetRootWindow(); ash::internal::ShelfLayoutManager* shelf = ShelfLayoutManager::ForLauncher(root_window); diff --git a/ash/system/tray/tray_event_filter.cc b/ash/system/tray/tray_event_filter.cc index a5ea3a2..676c8b6 100644 --- a/ash/system/tray/tray_event_filter.cc +++ b/ash/system/tray/tray_event_filter.cc @@ -75,7 +75,7 @@ bool TrayEventFilter::ProcessLocatedEvent(ui::LocatedEvent* event) { gfx::Rect bounds = bubble_widget->GetWindowBoundsInScreen(); bounds.Inset(wrapper->bubble_view()->GetBorderInsets()); - aura::RootWindow* root = bubble_widget->GetNativeView()->GetRootWindow(); + aura::Window* root = bubble_widget->GetNativeView()->GetRootWindow(); aura::client::ScreenPositionClient* screen_position_client = aura::client::GetScreenPositionClient(root); gfx::Point screen_point(event->root_location()); |