mash shelf: Don't create shelf DimmerView in ShelfWidget on mus

ash/shelf/dimmer_view.cc

 // Copyright 2016 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/shelf/dimmer_view.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/shell.h"
@@ skipping 44 matching lines @@
   // possible force state has disappeared.
   is_hovered_ = hovered;
   // Undim also if we were forced to by e.g. an open menu.
   hovered |= force_hovered_;
   background_animator_.SetDuration(hovered ? kTimeToUnDimMs : kTimeToDimMs);
   background_animator_.SetPaintsBackground(
       !hovered, disable_animations_for_test_ ? BACKGROUND_CHANGE_IMMEDIATE
                                              : BACKGROUND_CHANGE_ANIMATE);
 }
 
-void DimmerView::ForceUndimming(bool force) {
-  bool previous = force_hovered_;
-  force_hovered_ = force;
-  // If the forced change does change the result we apply the change.
-  if (is_hovered_ || force_hovered_ != is_hovered_ || previous)
-    SetHovered(is_hovered_);
-}
-
 void DimmerView::OnPaintBackground(gfx::Canvas* canvas) {
   SkPaint paint;
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   gfx::ImageSkia shelf_background =
       *rb->GetImageNamed(IDR_ASH_SHELF_DIMMING).ToImageSkia();
 
   if (!IsHorizontalAlignment(shelf_->GetAlignment())) {
     shelf_background = gfx::ImageSkiaOperations::CreateRotatedImage(
         shelf_background, shelf_->GetAlignment() == SHELF_ALIGNMENT_LEFT
                               ? SkBitmapOperations::ROTATION_90_CW
@@ skipping 13 matching lines @@
   return View::GetWidget();
 }
 
 void DimmerView::UpdateBackground(BackgroundAnimator* animator, int alpha) {
   alpha_ = alpha;
   SchedulePaint();
 }
 
 void DimmerView::BackgroundAnimationEnded(BackgroundAnimator* animator) {}
 
+views::Widget* DimmerView::GetDimmerWidget() {
+  return GetWidget();
+}
+
+void DimmerView::ForceUndimming(bool force) {
+  bool previous = force_hovered_;
+  force_hovered_ = force;
+  // If the forced change does change the result we apply the change.
+  if (is_hovered_ || force_hovered_ != is_hovered_ || previous)
+    SetHovered(is_hovered_);
+}
+
+int DimmerView::GetDimmingAlphaForTest() {
+  return alpha_;
+}
+
 void DimmerView::OnWindowBoundsChanged(WmWindow* window,
                                        const gfx::Rect& old_bounds,
                                        const gfx::Rect& new_bounds) {
   // Coming here the shelf got repositioned and since the dimmer is placed
   // in screen coordinates and not relative to the parent it needs to be
   // repositioned accordingly.
   GetWidget()->SetBounds(shelf_->GetWindow()->GetBoundsInScreen());
 }
 
 DimmerView::DimmerView(WmShelf* shelf, bool disable_animations_for_test)
@@ skipping 49 matching lines @@
                                &screen_point);
     touch_inside = owner_->GetBoundsInScreen().Contains(screen_point);
   }
 
   if (mouse_inside_ || touch_inside_ != mouse_inside_ || touch_inside)
     owner_->SetHovered(mouse_inside_ || touch_inside);
   touch_inside_ = touch_inside;
 }
 
 }  // namespace ash