mash: Break ash system tray dependencies on ash::ShelfWidget

ash/system/tray/tray_background_view.cc

 // 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.
 
 #include "ash/system/tray/tray_background_view.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_util.h"
-#include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/status_area_widget_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_event_filter.h"
 #include "ash/wm/window_animations.h"
 #include "base/command_line.h"
 #include "grit/ash_resources.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/aura/window.h"
@@ skipping 71 matching lines @@
   const static int kImageVertical = 1;
   const static int kNumOrientations = 2;
 
   explicit TrayBackground(TrayBackgroundView* tray_background_view) :
       tray_background_view_(tray_background_view) {
   }
 
   ~TrayBackground() override {}
 
  private:
-  ShelfWidget* GetShelfWidget() const {
-    return tray_background_view_->GetShelfLayoutManager()->shelf_widget();
+  WmShelf* GetShelf() const {
+    WmShelf* shelf = tray_background_view_->GetShelf();
+    DCHECK(shelf);

[msw, 2016/06/17 19:58:37]

q: why DCHECK here? nit: just one-line return tray_background_view_->GetShelf();

[James Cook, 2016/06/17 20:14:32]

Done.

+    return shelf;
   }
 
   void PaintMaterial(gfx::Canvas* canvas, views::View* view) const {
     SkColor background_color = SK_ColorTRANSPARENT;
-    ShelfWidget* shelf_widget = GetShelfWidget();
-    if (shelf_widget &&
-        shelf_widget->GetBackgroundType() ==
-            ShelfBackgroundType::SHELF_BACKGROUND_DEFAULT) {
+    if (GetShelf()->GetBackgroundType() ==
+        ShelfBackgroundType::SHELF_BACKGROUND_DEFAULT) {
       background_color = SkColorSetA(kShelfBaseColor,
                                      GetShelfConstant(SHELF_BACKGROUND_ALPHA));
     }
 
     // TODO(bruthig|tdanderson): The background should be changed using a
     // fade in/out animation.
     const int kCornerRadius = 2;
 
     SkPaint background_paint;
     background_paint.setFlags(SkPaint::kAntiAlias_Flag);
@@ skipping 18 matching lines @@
         IMAGE_GRID_HORIZONTAL(IDR_AURA_TRAY_BG_HORIZ_ONBLACK),
         IMAGE_GRID_HORIZONTAL(IDR_AURA_TRAY_BG_HORIZ_PRESSED),
       },
       { // Vertical
         IMAGE_GRID_VERTICAL(IDR_AURA_TRAY_BG_VERTICAL),
         IMAGE_GRID_VERTICAL(IDR_AURA_TRAY_BG_VERTICAL_ONBLACK),
         IMAGE_GRID_VERTICAL(IDR_AURA_TRAY_BG_VERTICAL_PRESSED),
       }
     };
 
-    int orientation = kImageHorizontal;
-    ShelfWidget* shelf_widget = GetShelfWidget();
-    if (shelf_widget &&
-        !shelf_widget->shelf_layout_manager()->IsHorizontalAlignment()) {
-      orientation = kImageVertical;
-    }
+    WmShelf* shelf = GetShelf();
+    const int orientation = IsHorizontalAlignment(shelf->GetAlignment())
+                                ? kImageHorizontal
+                                : kImageVertical;
 
     int state = kImageTypeDefault;
     if (tray_background_view_->draw_background_as_active())
       state = kImageTypePressed;
-    else if (shelf_widget && shelf_widget->GetDimsShelf())
+    else if (shelf->IsDimmed())
       state = kImageTypeOnBlack;
     else
       state = kImageTypeDefault;
 
     ui::CreateNineImagePainter(kImages[orientation][state])
         ->Paint(canvas, view->GetLocalBounds());
   }
 
   // Overridden from views::Background.
   void Paint(gfx::Canvas* canvas, views::View* view) const override {
@@ skipping 63 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // TrayBackgroundView
 
 TrayBackgroundView::TrayBackgroundView(StatusAreaWidget* status_area_widget)
     : status_area_widget_(status_area_widget),
       tray_container_(NULL),
       shelf_alignment_(SHELF_ALIGNMENT_BOTTOM),
       background_(NULL),
       draw_background_as_active_(false),
       widget_observer_(new TrayWidgetObserver(this)) {
+  DCHECK(status_area_widget->wm_shelf());
   set_notify_enter_exit_on_child(true);
 
   tray_container_ = new TrayContainer(shelf_alignment_);
   SetContents(tray_container_);
   tray_event_filter_.reset(new TrayEventFilter);
 
   SetPaintToLayer(true);
   layer()->SetFillsBoundsOpaquely(false);
   // Start the tray items not visible, because visibility changes are animated.
   views::View::SetVisible(false);
@@ skipping 122 matching lines @@
 
 void TrayBackgroundView::SetContents(views::View* contents) {
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
   AddChildView(contents);
 }
 void TrayBackgroundView::SetContentsBackground() {
   background_ = new TrayBackground(this);
   tray_container_->set_background(background_);
 }
 
-ShelfLayoutManager* TrayBackgroundView::GetShelfLayoutManager() {
-  return status_area_widget()->shelf_widget()->shelf_layout_manager();
+WmShelf* TrayBackgroundView::GetShelf() {
+  return status_area_widget_->wm_shelf();
 }
 
 void TrayBackgroundView::SetShelfAlignment(ShelfAlignment alignment) {
   shelf_alignment_ = alignment;
   tray_container_->SetAlignment(alignment);
 }
 
 void TrayBackgroundView::OnImplicitAnimationsCompleted() {
   // If there is another animation in the queue, the reverse animation was
   // triggered before the completion of animating to invisible. Do not turn off
@@ skipping 129 matching lines @@
     return;
   SchedulePaint();
 }
 
 void TrayBackgroundView::UpdateBubbleViewArrow(
     views::TrayBubbleView* bubble_view) {
   // Nothing to do here.
 }
 
 }  // namespace ash