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

Unified Diff: ash/shelf/overflow_bubble.cc

Issue 1929203002: mash: Fix crash when clicking on the shelf overflow icon (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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 | « ash/root_window_controller.h ('k') | ash/system/tray/tray_background_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/overflow_bubble.cc
diff --git a/ash/shelf/overflow_bubble.cc b/ash/shelf/overflow_bubble.cc
index 226bf59a1ecdbe598d4dad80ad0cee76df7d20bf..19f460cf5fe298630fbe5eaf71141794f3cb3204 100644
--- a/ash/shelf/overflow_bubble.cc
+++ b/ash/shelf/overflow_bubble.cc
@@ -4,13 +4,12 @@
#include "ash/shelf/overflow_bubble.h"
-#include "ash/root_window_controller.h"
#include "ash/shelf/overflow_bubble_view.h"
#include "ash/shelf/shelf.h"
#include "ash/shelf/shelf_view.h"
#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
-#include "ash/system/tray/system_tray.h"
+#include "ash/system/tray/tray_background_view.h"
#include "ui/aura/client/screen_position_client.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/events/event.h"
@@ -36,10 +35,10 @@ void OverflowBubble::Show(views::View* anchor, ShelfView* shelf_view) {
shelf_view_ = shelf_view;
anchor_ = anchor;
+ // TODO(jamescook): Change this to a PointerWatcher.
Shell::GetInstance()->AddPreTargetHandler(this);
- RootWindowController::ForWindow(anchor->GetWidget()->GetNativeView())->
- GetSystemTray()->InitializeBubbleAnimations(bubble_->GetWidget());
+ TrayBackgroundView::InitializeBubbleAnimations(bubble_->GetWidget());
bubble_->GetWidget()->AddObserver(this);
bubble_->GetWidget()->Show();
}
« no previous file with comments | « ash/root_window_controller.h ('k') | ash/system/tray/tray_background_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698