ash:Shelf - Update position and hit box of status area.

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 @@
 namespace {
 
 const int kButtonHoverAlpha = 150;
 
 const int kButtonCornerRadius = 2;
 
 const int kButtonHoverSize = 28;
 
 const int kBackgroundOffset = (48 - kButtonHoverSize) / 2;
 
-// Padding from the inner edge of the shelf (towards center of display) to
-// the edge of the background image of the overflow button.
-const int kImagePaddingFromShelf = 5;
-
 }  // namesapce
 
 OverflowButton::OverflowButton(views::ButtonListener* listener)
     : CustomButton(listener),
       bottom_image_(NULL) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   bottom_image_ = rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW).ToImageSkia();
 
 
   set_accessibility_focusable(true);
@@ skipping 50 matching lines @@
       background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_PRESSED;
     else if(layout_manager->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() - kImagePaddingFromShelf,
+          bounds.right() - background->width() -
+              ShelfLayoutManager::kShelfItemInset,
           bounds.y() + (bounds.height() - background->height()) / 2,
           background->width(), background->height());
     } else if (alignment == SHELF_ALIGNMENT_RIGHT) {
       bounds = gfx::Rect(
-          bounds.x() + kImagePaddingFromShelf,
+          bounds.x() + ShelfLayoutManager::kShelfItemInset,
           bounds.y() + (bounds.height() - background->height()) / 2,
           background->width(), background->height());
     } else {
       bounds = gfx::Rect(
           bounds.x() + (bounds.width() - background->width()) / 2,
-          bounds.y() + kImagePaddingFromShelf,
+          bounds.y() + ShelfLayoutManager::kShelfItemInset,
           background->width(), background->height());
     }
     canvas->DrawImageInt(*background, bounds.x(), bounds.y());
   } else {
     if (alignment == SHELF_ALIGNMENT_BOTTOM) {
       bounds = gfx::Rect(
           bounds.x() + ((bounds.width() - kButtonHoverSize) / 2) - 1,
           bounds.y() + kBackgroundOffset - 1,
           kButtonHoverSize, kButtonHoverSize);
     } else {
@@ skipping 36 matching lines @@
       break;
   }
 
   canvas->DrawImageInt(*image,
                        bounds.x() + ((bounds.width() - image->width()) / 2),
                        bounds.y() + ((bounds.height() - image->height()) / 2));
 }
 
 }  // namespace internal
 }  // namespace ash