Fixing various problems with the new shelf layout in conjunction with the blue tray background on b…

ash/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_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
 #define ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
 
 #include "ash/ash_export.h"
 #include "ash/shelf/background_animator.h"
 #include "ash/shelf/shelf_types.h"
@@ skipping 106 matching lines @@
 
   // Returns the anchor rect for the bubble.
   gfx::Rect GetBubbleAnchorRect(
       views::Widget* anchor_widget,
       views::TrayBubbleView::AnchorType anchor_type,
       views::TrayBubbleView::AnchorAlignment anchor_alignment) const;
 
   // Returns the bubble anchor alignment based on |shelf_alignment_|.
   views::TrayBubbleView::AnchorAlignment GetAnchorAlignment() const;
 
-  // Updates the view visual based on the visibility of the bubble.
-  void SetBubbleVisible(bool visible);
+  // Forces the background to be drawn active if set to true.
+  void SetDrawBackgroundAsActive(bool visible);
+
+  // Returns true when the the background was overridden to be drawn as active.
+  bool draw_background_as_active() const {return draw_background_as_active_; }
 
   StatusAreaWidget* status_area_widget() {
     return status_area_widget_;
   }
   const StatusAreaWidget* status_area_widget() const {
     return status_area_widget_;
   }
   TrayContainer* tray_container() const { return tray_container_; }
   ShelfAlignment shelf_alignment() const { return shelf_alignment_; }
   TrayEventFilter* tray_event_filter() { return tray_event_filter_.get(); }
 
   ShelfLayoutManager* GetShelfLayoutManager();
 
-  // Updates the arrow visibilty based on the launcher visibilty.
+  // Updates the arrow visibility based on the launcher visibility.
   void UpdateBubbleViewArrow(views::TrayBubbleView* bubble_view);
 
-  // Provides the background with a function to query for pressed state.
-  virtual bool IsPressed();
-
  private:
   class TrayWidgetObserver;
 
   // Called from Initialize after all status area trays have been created.
   // Sets the border based on the position of the view.
   void SetBorder();
 
   // Unowned pointer to parent widget.
   StatusAreaWidget* status_area_widget_;
 
   // Convenience pointer to the contents view.
   TrayContainer* tray_container_;
 
   // Shelf alignment.
   ShelfAlignment shelf_alignment_;
 
   // Owned by the view passed to SetContents().
   internal::TrayBackground* background_;
 
+  // Animators for the background. They are only used for the old shelf layout.
   internal::BackgroundAnimator hide_background_animator_;
   internal::BackgroundAnimator hover_background_animator_;
+
+  // True if the background gets hovered.
   bool hovered_;
-  bool pressed_;
+
+  // This variable will store the activation override which will tint the
+  // background differently if set to true.

[jennyz, 2013/09/05 18:29:22]

nit: s/will store/stores? sounds more consistent with rest of the comment style.

[Mr4D (OOO till 08-26), 2013/09/05 18:46:32]

Done.

+  bool draw_background_as_active_;
+
   scoped_ptr<TrayWidgetObserver> widget_observer_;
   scoped_ptr<TrayEventFilter> tray_event_filter_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_