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

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

Issue 2723843002: Remove non-MD code from TrayBackgroundView (Closed)
Patch Set: Rebased Created 3 years, 9 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/common/system/tray/system_tray.cc ('k') | ash/common/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/common/system/tray/tray_background_view.h
diff --git a/ash/common/system/tray/tray_background_view.h b/ash/common/system/tray/tray_background_view.h
index 49e71055e55adee2fc1244a00d2b6f4ef0d96dff..6714d69a2bf6a60cebc2a4f8c4428fccc88ac9b5 100644
--- a/ash/common/system/tray/tray_background_view.h
+++ b/ash/common/system/tray/tray_background_view.h
@@ -60,7 +60,10 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView,
DISALLOW_COPY_AND_ASSIGN(TrayContainer);
};
- explicit TrayBackgroundView(WmShelf* wm_shelf);
+ // TODO(mohsen): Remove |draws_background| paramter when LogoutButtonTray, as
+ // the only reason for existence of this parameter, is no longer a
+ // TrayBackgroundView. See https://crbug.com/698134.
+ TrayBackgroundView(WmShelf* wm_shelf, bool draws_background);
~TrayBackgroundView() override;
// Called after the tray has been added to the widget containing it.
@@ -81,7 +84,6 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView,
std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override;
std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight()
const override;
- void OnGestureEvent(ui::GestureEvent* event) override;
// Called whenever the shelf alignment changes.
virtual void SetShelfAlignment(ShelfAlignment alignment);
@@ -103,14 +105,6 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView,
// May close the bubble.
virtual void ClickedOutsideBubble() = 0;
- // Sets |contents| as a child.
- void SetContents(views::View* contents);
-
- // Creates and sets contents background to |background_|. |draws_active|
- // determines if the view's background should be drawn as active when the view
- // is in the active state.
- void SetContentsBackground(bool draws_active);
-
// Returns the bubble anchor alignment based on |shelf_alignment_|.
views::TrayBubbleView::AnchorAlignment GetAnchorAlignment() const;
@@ -178,8 +172,8 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView,
// Owned by the view passed to SetContents().
TrayBackground* background_;
- // Determines if the view is active. This changes how the background is drawn
- // in non-MD version and how the ink drop ripples behave in MD version.
+ // Determines if the view is active. This changes how the ink drop ripples
+ // behave.
bool is_active_;
// Visibility of this tray's separator which is a line of 1x32px and 4px to
« no previous file with comments | « ash/common/system/tray/system_tray.cc ('k') | ash/common/system/tray/tray_background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698