Cleanup ash shelf accessor functions.

ash/shelf/shelf_tooltip_manager.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/shelf_tooltip_manager.h"
 
+#include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_animations.h"
 #include "base/bind.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "ui/aura/window.h"
@@ skipping 320 matching lines @@
 
   timer_.reset();
 }
 
 void ShelfTooltipManager::CreateBubble(views::View* anchor,
                                        const base::string16& text) {
   DCHECK(!view_);
 
   anchor_ = anchor;
   text_ = text;
-  views::BubbleBorder::Arrow arrow =
-      shelf_layout_manager_->SelectValueForShelfAlignment(
-          views::BubbleBorder::BOTTOM_CENTER,
-          views::BubbleBorder::LEFT_CENTER,
-          views::BubbleBorder::RIGHT_CENTER,
-          views::BubbleBorder::TOP_CENTER);
+  Shelf* shelf = shelf_layout_manager_->shelf_widget()->shelf();
+  views::BubbleBorder::Arrow arrow = shelf->SelectValueForShelfAlignment(
+      views::BubbleBorder::BOTTOM_CENTER, views::BubbleBorder::LEFT_CENTER,
+      views::BubbleBorder::RIGHT_CENTER, views::BubbleBorder::TOP_CENTER);
 
   view_ = new ShelfTooltipBubble(anchor, arrow, this);
   widget_ = view_->GetWidget();
   view_->SetText(text_);
 
   gfx::NativeView native_view = widget_->GetNativeView();
   wm::SetWindowVisibilityAnimationType(
       native_view, wm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL);
   wm::SetWindowVisibilityAnimationTransition(
       native_view, wm::ANIMATE_HIDE);
 }
 
 void ShelfTooltipManager::CreateTimer(int delay_in_ms) {
   base::OneShotTimer* new_timer = new base::OneShotTimer();
   new_timer->Start(FROM_HERE,
                    base::TimeDelta::FromMilliseconds(delay_in_ms),
                    this,
                    &ShelfTooltipManager::ShowInternal);
   timer_.reset(new_timer);
 }
 
 }  // namespace ash