ash: Fix launcher icon overlaps with status.

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_
 #pragma once
 
 #include <utility>
 #include <vector>
@@ skipping 23 matching lines @@
 class LauncherButton;
 
 class ASH_EXPORT LauncherView : public views::View,
                                 public LauncherModelObserver,
                                 public views::ButtonListener,
                                 public LauncherButtonHost,
                                 public views::ContextMenuController,
                                 public views::FocusTraversable {
  public:
   // Use the api in this class for testing only.
   class ASH_EXPORT TestAPI {

[sky, 2012/04/13 22:00:04]

Can you move this into a separate file and make it a friend?

[xiyuan, 2012/04/23 18:08:53]

Done.

    public:
     explicit TestAPI(LauncherView* launcher_view)
         : launcher_view_(launcher_view) {
     }
+
     // Number of icons displayed.
     int GetButtonCount();
+
     // Retrieve the button at |index|.
     LauncherButton* GetButton(int index);
 
+    // Last visible button index.
+    int GetLastVisibleIndex();
+
+    // Returns true if overflow button is visible.
+    bool IsOverflowButtonVisible();
+
+    // Sets animation duration in milliseconds for test.
+    void SetAnimationDuration(int duration_ms);
+
+    // Runs message loop and waits until all add/remove animations are done.
+    void RunMessageLoopUntilAnimationsDone();
+
    private:
     LauncherView* launcher_view_;
 
     DISALLOW_COPY_AND_ASSIGN(TestAPI);
   };
 
   LauncherView(LauncherModel* model, LauncherDelegate* delegate);
   virtual ~LauncherView();
 
   void Init();
@@ skipping 98 matching lines @@
   // The model; owned by Launcher.
   LauncherModel* model_;
 
   // Delegate; owned by Launcher.
   LauncherDelegate* delegate_;
 
   // Used to manage the set of active launcher buttons. There is a view per
   // item in |model_|.
   scoped_ptr<views::ViewModel> view_model_;
 
+  // Index of the last visible launcher button (does not go into overflow).
+  int last_visible_index_;
+
   scoped_ptr<views::BoundsAnimator> bounds_animator_;
 
   views::ImageButton* overflow_button_;
 
   // Are we dragging? This is only set if the mouse is dragged far enough to
   // trigger a drag.
   bool dragging_;
 
   // The view being dragged. This is set immediately when the mouse is pressed.
   // |dragging_| is set only if the mouse is dragged far enough.
@@ skipping 16 matching lines @@
   scoped_ptr<views::MenuRunner> launcher_menu_runner_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(LauncherView);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_LAUNCHER_LAUNCHER_VIEW_H_