Use the correct launcher assets for shelf alignment.

ash/launcher/launcher_view.h

 // 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.
 
 #ifndef ASH_LAUNCHER_LAUNCHER_VIEW_H_
 #define ASH_LAUNCHER_LAUNCHER_VIEW_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 88 matching lines @@
  private:
   friend class ash::test::LauncherViewTestAPI;
 
   class FadeOutAnimationDelegate;
   class StartFadeAnimationDelegate;
 
   struct IdealBounds {
     gfx::Rect overflow_bounds;
   };
 
-  // Used in calculating ideal bounds.
-  int primary_axis_coordinate(int x, int y) const {
-    return is_horizontal_alignment() ? x : y;
-  }
-
-  bool is_horizontal_alignment() const {
-    return alignment_ == SHELF_ALIGNMENT_BOTTOM;
-  }
-
-  // Used in calculating ideal bounds.
-  int alignment_based_value(int bottom, int left, int right) const {
-    return (SHELF_ALIGNMENT_BOTTOM == alignment_ ? bottom :
-        (SHELF_ALIGNMENT_LEFT == alignment_ ? left : right));
-  }
-
   bool is_overflow_mode() const {
     return first_visible_index_ > 0;
   }
 
   bool dragging() const {
     return drag_pointer_ != NONE;
   }
 
   // Sets the bounds of each view to its ideal bounds.
   void LayoutToIdealBounds();
@@ skipping 68 matching lines @@
   virtual void PointerDraggedOnButton(
       views::View* view,
       Pointer pointer,
       const ui::LocatedEvent& event) OVERRIDE;
   virtual void PointerReleasedOnButton(views::View* view,
                                        Pointer pointer,
                                        bool canceled) OVERRIDE;
   virtual void MouseMovedOverButton(views::View* view) OVERRIDE;
   virtual void MouseEnteredButton(views::View* view) OVERRIDE;
   virtual void MouseExitedButton(views::View* view) OVERRIDE;
-  virtual ShelfAlignment GetShelfAlignment() const OVERRIDE;
   virtual string16 GetAccessibleName(const views::View* view) OVERRIDE;
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE;
 
   // Overridden from views::ContextMenuController:
   virtual void ShowContextMenuForView(views::View* source,
                                       const gfx::Point& point) OVERRIDE;
 
@@ skipping 62 matching lines @@
 
   ShelfGestureHandler gesture_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherView);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_LAUNCHER_LAUNCHER_VIEW_H_