Reland: mash: Convert TrayBackgroundView to wm common types

ash/common/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/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/screen_util.h"
-#include "ash/shell.h"
-#include "ash/system/status_area_widget.h"
-#include "ash/system/status_area_widget_delegate.h"
+#include "ash/common/system/tray/tray_event_filter.h"
+#include "ash/common/wm_lookup.h"
+#include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.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"
-#include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/nine_image_painter_factory.h"
 #include "ui/base/ui_base_switches_util.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_element.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/animation/tween.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image_skia.h"
@@ skipping 60 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:
-  WmShelf* GetShelf() const {
-    return tray_background_view_->GetShelf();
-  }
+  WmShelf* GetShelf() const { return tray_background_view_->shelf(); }
 
   void PaintMaterial(gfx::Canvas* canvas, views::View* view) const {
     SkColor background_color = SK_ColorTRANSPARENT;
     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
@@ skipping 108 matching lines @@
 
   views::BoxLayout* layout = new views::BoxLayout(orientation, 0, 0, 0);
   layout->SetDefaultFlex(1);
   views::View::SetLayoutManager(layout);
   PreferredSizeChanged();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TrayBackgroundView
 
-TrayBackgroundView::TrayBackgroundView(StatusAreaWidget* status_area_widget)
-    : status_area_widget_(status_area_widget),
+TrayBackgroundView::TrayBackgroundView(WmShelf* wm_shelf)
+    : wm_shelf_(wm_shelf),
       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());
+  DCHECK(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);
 }
 
 TrayBackgroundView::~TrayBackgroundView() {
   if (GetWidget())
     GetWidget()->RemoveObserver(widget_observer_.get());
   StopObservingImplicitAnimations();
 }
 
 void TrayBackgroundView::Initialize() {
   GetWidget()->AddObserver(widget_observer_.get());
 }
 
 // static
 void TrayBackgroundView::InitializeBubbleAnimations(
     views::Widget* bubble_widget) {
-  aura::Window* window = bubble_widget->GetNativeWindow();
-  ::wm::SetWindowVisibilityAnimationType(
-      window, ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
-  ::wm::SetWindowVisibilityAnimationTransition(window, ::wm::ANIMATE_HIDE);
-  ::wm::SetWindowVisibilityAnimationDuration(
-      window, base::TimeDelta::FromMilliseconds(kAnimationDurationForPopupMs));
+  WmWindow* window = WmLookup::Get()->GetWindowForWidget(bubble_widget);
+  window->SetVisibilityAnimationType(
+      ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
+  window->SetVisibilityAnimationTransition(::wm::ANIMATE_HIDE);
+  window->SetVisibilityAnimationDuration(
+      base::TimeDelta::FromMilliseconds(kAnimationDurationForPopupMs));
 }
 
 void TrayBackgroundView::SetVisible(bool visible) {
   if (visible == layer()->GetTargetVisibility())
     return;
 
   if (visible) {
     // The alignment of the shelf can change while the TrayBackgroundView is
     // hidden. Reset the offscreen transform so that the animation to becoming
     // visible reflects the current layout.
@@ skipping 91 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_);
 }
 
-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
   // the visibility so that the next animation may render. The value of
   // layer()->GetTargetVisibility() can be incorrect if the hide animation was
@@ skipping 56 matching lines @@
       int vertical_alignment = 0;
       int horizontal_alignment = kBubblePaddingVerticalBottom;
       if (anchor_alignment == TrayBubbleView::ANCHOR_ALIGNMENT_LEFT)
         rect.Inset(vertical_alignment, 0, 0, horizontal_alignment);
       else if (anchor_alignment == TrayBubbleView::ANCHOR_ALIGNMENT_RIGHT)
         rect.Inset(0, 0, vertical_alignment, horizontal_alignment);
     } else {
       DCHECK(false) << "Unhandled anchor type.";
     }
   } else {
-    aura::Window* target_root = anchor_widget ?
-        anchor_widget->GetNativeView()->GetRootWindow() :
-        Shell::GetPrimaryRootWindow();
-    rect = target_root->bounds();
+    WmWindow* target_root = anchor_widget
+                                ? WmLookup::Get()
+                                      ->GetWindowForWidget(anchor_widget)
+                                      ->GetRootWindow()
+                                : WmShell::Get()->GetPrimaryRootWindow();
+    rect = target_root->GetBounds();
     if (anchor_type == TrayBubbleView::ANCHOR_TYPE_TRAY) {
       if (anchor_alignment == TrayBubbleView::ANCHOR_ALIGNMENT_BOTTOM) {
         rect = gfx::Rect(
             base::i18n::IsRTL() ?
             kPaddingFromRightEdgeOfScreenBottomAlignment :
             rect.width() - kPaddingFromRightEdgeOfScreenBottomAlignment,
             rect.height() - kPaddingFromBottomOfScreenBottomAlignment,
             0, 0);
-        rect = ScreenUtil::ConvertRectToScreen(target_root, rect);
+        rect = target_root->ConvertRectToScreen(rect);
       } else if (anchor_alignment == TrayBubbleView::ANCHOR_ALIGNMENT_LEFT) {
         rect = gfx::Rect(
             kPaddingFromRightEdgeOfScreenBottomAlignment,
             rect.height() - kPaddingFromBottomOfScreenBottomAlignment,
             1, 1);
-        rect = ScreenUtil::ConvertRectToScreen(target_root, rect);
+        rect = target_root->ConvertRectToScreen(rect);
       } else if (anchor_alignment == TrayBubbleView::ANCHOR_ALIGNMENT_RIGHT) {
         rect = gfx::Rect(
             rect.width() - kPaddingFromRightEdgeOfScreenBottomAlignment,
             rect.height() - kPaddingFromBottomOfScreenBottomAlignment,
             1, 1);
-        rect = ScreenUtil::ConvertRectToScreen(target_root, rect);
+        rect = target_root->ConvertRectToScreen(rect);
       } else {
         // TODO(bruthig) May need to handle other ANCHOR_ALIGNMENT_ values.
         // ie. ANCHOR_ALIGNMENT_TOP
         DCHECK(false) << "Unhandled anchor alignment.";
       }
     } else {
       rect = gfx::Rect(
           base::i18n::IsRTL() ?
           kPaddingFromRightEdgeOfScreenBottomAlignment :
           rect.width() - kPaddingFromRightEdgeOfScreenBottomAlignment,
@@ skipping 20 matching lines @@
     return;
   SchedulePaint();
 }
 
 void TrayBackgroundView::UpdateBubbleViewArrow(
     views::TrayBubbleView* bubble_view) {
   // Nothing to do here.
 }
 
 }  // namespace ash