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

Unified Diff: ash/system/tray/tray_background_view.h

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/shelf/overflow_bubble.cc ('k') | ash/system/tray/tray_background_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/tray_background_view.h
diff --git a/ash/system/tray/tray_background_view.h b/ash/system/tray/tray_background_view.h
index ecf8404441efcf8c0a47d6211f18df6964f96a74..2aecdd54226aa3485359d5586036a244e9b12515 100644
--- a/ash/system/tray/tray_background_view.h
+++ b/ash/system/tray/tray_background_view.h
@@ -68,6 +68,9 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView,
// Called after the tray has been added to the widget containing it.
virtual void Initialize();
+ // Initializes animations for the bubble.
+ static void InitializeBubbleAnimations(views::Widget* bubble_widget);
+
// views::View:
void SetVisible(bool visible) override;
const char* GetClassName() const override;
@@ -116,9 +119,6 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView,
void SetPaintsBackground(bool value,
BackgroundAnimatorChangeType change_type);
- // Initializes animations for the bubble.
- void InitializeBubbleAnimations(views::Widget* bubble_widget);
-
// Returns the window hosting the bubble.
aura::Window* GetBubbleWindowContainer() const;
« no previous file with comments | « ash/shelf/overflow_bubble.cc ('k') | ash/system/tray/tray_background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698