Use the correct launcher assets for shelf alignment.

ash/launcher/launcher_tooltip_manager.cc

 // 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.
 
 #include "ash/launcher/launcher_tooltip_manager.h"
 
 #include "ash/launcher/launcher_view.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/session_state_controller.h"
 #include "ash/wm/session_state_observer.h"
+#include "ash/wm/shelf_layout_manager.h"
 #include "ash/wm/window_animations.h"
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event.h"
 #include "ui/base/events/event_constants.h"
 #include "ui/gfx/insets.h"
@@ skipping 12 matching lines @@
 const int kTooltipMinHeight = 29 - 2 * kTooltipTopBottomMargin;
 const SkColor kTooltipTextColor = SkColorSetRGB(0x22, 0x22, 0x22);
 
 // The maximum width of the tooltip bubble.  Borrowed the value from
 // ash/tooltip/tooltip_controller.cc
 const int kTooltipMaxWidth = 250;
 
 // The distance between the arrow tip and edge of the anchor view.
 const int kArrowOffset = 10;
 
-views::BubbleBorder::ArrowLocation GetArrowLocation(ShelfAlignment alignment) {
-  switch (alignment) {
-    case SHELF_ALIGNMENT_LEFT:
-      return views::BubbleBorder::LEFT_CENTER;
-    case SHELF_ALIGNMENT_RIGHT:
-      return views::BubbleBorder::RIGHT_CENTER;
-    case SHELF_ALIGNMENT_BOTTOM:
-      return views::BubbleBorder::BOTTOM_CENTER;
-  }
-
-  return views::BubbleBorder::NONE;
-}
 }  // namespace
 
 // The implementation of tooltip of the launcher.
 class LauncherTooltipManager::LauncherTooltipBubble
     : public views::BubbleDelegateView {
  public:
   LauncherTooltipBubble(views::View* anchor,
                         views::BubbleBorder::ArrowLocation arrow_location,
                         LauncherTooltipManager* host);
 
@@ skipping 66 matching lines @@
 gfx::Size LauncherTooltipManager::LauncherTooltipBubble::GetPreferredSize() {
   gfx::Size pref_size = views::BubbleDelegateView::GetPreferredSize();
   if (pref_size.height() < kTooltipMinHeight)
     pref_size.set_height(kTooltipMinHeight);
   if (pref_size.width() > kTooltipMaxWidth)
     pref_size.set_width(kTooltipMaxWidth);
   return pref_size;
 }
 
 LauncherTooltipManager::LauncherTooltipManager(
-    ShelfAlignment alignment,
     ShelfLayoutManager* shelf_layout_manager,
     LauncherView* launcher_view)
     : view_(NULL),
       widget_(NULL),
       anchor_(NULL),
-      alignment_(alignment),
       shelf_layout_manager_(shelf_layout_manager),
       launcher_view_(launcher_view) {
   if (shelf_layout_manager)
     shelf_layout_manager->AddObserver(this);
   if (Shell::HasInstance()) {
     Shell::GetInstance()->AddPreTargetHandler(this);
     Shell::GetInstance()->session_state_controller()->AddObserver(this);
   }
 }
 
@@ skipping 51 matching lines @@
   }
 }
 
 void LauncherTooltipManager::OnBubbleClosed(views::BubbleDelegateView* view) {
   if (view == view_) {
     view_ = NULL;
     widget_ = NULL;
   }
 }
 
-void LauncherTooltipManager::SetArrowLocation(ShelfAlignment alignment) {
-  if (alignment_ == alignment)
-    return;
-
-  alignment_ = alignment;
+void LauncherTooltipManager::UpdateArrowLocation() {
   if (view_) {
     CancelHidingAnimation();
     Close();
     ShowImmediately(anchor_, text_);
   }
 }
 
 void LauncherTooltipManager::ResetTimer() {
   if (timer_.get() && timer_->IsRunning()) {
     timer_->Reset();
@@ skipping 126 matching lines @@
 
   timer_.reset();
 }
 
 void LauncherTooltipManager::CreateBubble(views::View* anchor,
                                           const string16& text) {
   DCHECK(!view_);
 
   anchor_ = anchor;
   text_ = text;
-  view_ = new LauncherTooltipBubble(
-      anchor, GetArrowLocation(alignment_), this);
+  views::BubbleBorder::ArrowLocation arrow_location =
+      shelf_layout_manager_->SelectValueForShelfAlignment(
+          views::BubbleBorder::BOTTOM_CENTER,
+          views::BubbleBorder::LEFT_CENTER,
+          views::BubbleBorder::RIGHT_CENTER);
+
+  view_ = new LauncherTooltipBubble(anchor, arrow_location, this);
   widget_ = view_->GetWidget();
   view_->SetText(text_);
 
   gfx::NativeView native_view = widget_->GetNativeView();
   views::corewm::SetWindowVisibilityAnimationType(
       native_view, views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL);
   views::corewm::SetWindowVisibilityAnimationTransition(
       native_view, views::corewm::ANIMATE_HIDE);
 }
 
 }  // namespace internal
 }  // namespace ash