ash: Explicitly teach various components about ShelfLayoutManager.

ash/shelf/overflow_button.cc

 // Copyright 2013 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/overflow_button.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "grit/ash_resources.h"
@@ skipping 16 matching lines @@
 const int kButtonHoverAlpha = 150;
 
 const int kButtonCornerRadius = 2;
 
 const int kButtonHoverSize = 28;
 
 const int kBackgroundOffset = (48 - kButtonHoverSize) / 2;
 
 }  // namesapce
 
-OverflowButton::OverflowButton(views::ButtonListener* listener)
-    : CustomButton(listener),
-      bottom_image_(NULL) {
+OverflowButton::OverflowButton(views::ButtonListener* listener,
+                               ShelfLayoutManager* shelf)
+    : CustomButton(listener), bottom_image_(NULL), shelf_(shelf) {

[sky, 2016/02/03 00:01:42]

nit: nullptr

[sadrul, 2016/02/03 02:07:58]

Done.

   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   bottom_image_ = rb->GetImageNamed(IDR_ASH_SHELF_OVERFLOW).ToImageSkia();
 
   SetAccessibilityFocusable(true);
   SetAccessibleName(l10n_util::GetStringUTF16(IDS_ASH_SHELF_OVERFLOW_NAME));
 }
 
 OverflowButton::~OverflowButton() {}
 
 void OverflowButton::OnShelfAlignmentChanged() {
   SchedulePaint();
 }
 
 void OverflowButton::PaintBackground(gfx::Canvas* canvas, int alpha) {
   gfx::Rect bounds(GetContentsBounds());
   gfx::Rect rect(0, 0, kButtonHoverSize, kButtonHoverSize);
-  ShelfLayoutManager* shelf =
-      ShelfLayoutManager::ForShelf(GetWidget()->GetNativeView());
 
   // Nudge the background a little to line up right.
-  if (shelf->IsHorizontalAlignment()) {
+  if (shelf_->IsHorizontalAlignment()) {
     rect.set_origin(gfx::Point(
         bounds.x() + ((bounds.width() - kButtonHoverSize) / 2) - 1,
         bounds.y() + kBackgroundOffset - 1));
 
   } else {
     rect.set_origin(gfx::Point(
         bounds.x() + kBackgroundOffset - 1,
         bounds.y() + ((bounds.height() - kButtonHoverSize) / 2) - 1));
   }
 
   SkPaint paint;
   paint.setAntiAlias(true);
   paint.setStyle(SkPaint::kFill_Style);
   paint.setColor(
       SkColorSetA(SK_ColorBLACK,
                   hover_animation().CurrentValueBetween(0, kButtonHoverAlpha)));
 
   const SkScalar radius = SkIntToScalar(kButtonCornerRadius);
   SkPath path;
   path.addRoundRect(gfx::RectToSkRect(rect), radius, radius);
   canvas->DrawPath(path, paint);
 }
 
 void OverflowButton::OnPaint(gfx::Canvas* canvas) {
-  ShelfLayoutManager* layout_manager =
-      ShelfLayoutManager::ForShelf(GetWidget()->GetNativeView());
-  ShelfAlignment alignment = layout_manager->GetAlignment();
+  ShelfAlignment alignment = shelf_->GetAlignment();
 
   gfx::Rect bounds(GetContentsBounds());
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   int background_image_id = 0;
-  if (layout_manager->shelf_widget()->shelf()->IsShowingOverflowBubble())
+  if (shelf_->shelf_widget()->shelf()->IsShowingOverflowBubble())
     background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_PRESSED;
-  else if(layout_manager->shelf_widget()->GetDimsShelf())
+  else if (shelf_->shelf_widget()->GetDimsShelf())
     background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_ON_BLACK;
   else
     background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_NORMAL;
 
   const gfx::ImageSkia* background =
       rb.GetImageNamed(background_image_id).ToImageSkia();
   if (alignment == SHELF_ALIGNMENT_LEFT) {
     bounds = gfx::Rect(
         bounds.right() - background->width() -
             ShelfLayoutManager::kShelfItemInset,
@@ skipping 36 matching lines @@
       image = bottom_image_;
       break;
   }
 
   canvas->DrawImageInt(*image,
                        bounds.x() + ((bounds.width() - image->width()) / 2),
                        bounds.y() + ((bounds.height() - image->height()) / 2));
 }
 
 }  // namespace ash