Remove non-MD code from TrayBackgroundView

ash/common/system/tray/tray_background_view.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
 #define ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
@@ skipping 42 matching lines @@
    private:
     void UpdateLayout();
 
     ShelfAlignment alignment_;
     int main_axis_margin_ = 0;
     int cross_axis_margin_ = 0;
 
     DISALLOW_COPY_AND_ASSIGN(TrayContainer);
   };
 
-  explicit TrayBackgroundView(WmShelf* wm_shelf);
+  TrayBackgroundView(WmShelf* wm_shelf, bool no_background);

[Evan Stade, 2017/03/02 02:49:51]

I would expect this to be inverted, i.e. bool draws_background

That said, does LogoutButton need to be a TrayBackgroundView? It doesn't have a
background or a separator. What functionality is it actually relying on?

[mohsen, 2017/03/02 04:07:09]

Done.
 
Hmm, good question. It doesn't even use clickability of ActionableView since it
hosts its own clickable button. It apparently only uses TrayBackgroundView's
TrayContainer layout. Probably we can take TrayContainer out of
TrayBackgroundView and make logout button a regular View that uses
TrayContainer? Added a TODO.

   ~TrayBackgroundView() override;
 
   // 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;
   void ChildPreferredSizeChanged(views::View* child) override;
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
   void AboutToRequestFocusFromTabTraversal(bool reverse) override;
   void OnPaint(gfx::Canvas* canvas) override;
 
   // 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);
 
   // Called when the anchor (tray or bubble) may have moved or changed.
   virtual void AnchorUpdated() {}
 
   // Called from GetAccessibleNodeData, must return a valid accessible name.
   virtual base::string16 GetAccessibleNameForTray() = 0;
 
   // Called when the bubble is resized.
   virtual void BubbleResized(const views::TrayBubbleView* bubble_view) {}
 
   // Hides the bubble associated with |bubble_view|. Called when the widget
   // is closed.
   virtual void HideBubbleWithView(const views::TrayBubbleView* bubble_view) = 0;
 
   // Called by the bubble wrapper when a click event occurs outside the bubble.
   // 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;
 
   void SetIsActive(bool is_active);
   bool is_active() const { return is_active_; }
 
   TrayContainer* tray_container() const { return tray_container_; }
   ShelfAlignment shelf_alignment() const { return shelf_alignment_; }
   TrayEventFilter* tray_event_filter() { return tray_event_filter_.get(); }
   WmShelf* shelf() { return wm_shelf_; }
@@ skipping 47 matching lines @@
   // Convenience pointer to the contents view.
   TrayContainer* tray_container_;
 
   // Shelf alignment.
   // TODO(jamescook): Don't cache this, get it from WmShelf.
   ShelfAlignment shelf_alignment_;
 
   // 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
   // right of tray.
   bool separator_visible_;
 
   std::unique_ptr<TrayWidgetObserver> widget_observer_;
   std::unique_ptr<TrayEventFilter> tray_event_filter_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_