chromeos: Rename ash::WmShelf to Shelf

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/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
+#include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_view.h"
-#include "ash/shelf/wm_shelf.h"
 #include "ash/shell_port.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/wm_window.h"
 #include "base/bind.h"
 #include "base/strings/string16.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
@@ skipping 96 matching lines @@
   int GetDialogButtons() const override { return ui::DIALOG_BUTTON_NONE; }
 
   DISALLOW_COPY_AND_ASSIGN(ShelfTooltipBubble);
 };
 
 ShelfTooltipManager::ShelfTooltipManager(ShelfView* shelf_view)
     : timer_delay_(kTooltipAppearanceDelay),
       shelf_view_(shelf_view),
       bubble_(nullptr),
       weak_factory_(this) {
-  shelf_view_->wm_shelf()->AddObserver(this);
+  shelf_view_->shelf()->AddObserver(this);
   ShellPort::Get()->AddPointerWatcher(this,
                                       views::PointerWatcherEventTypes::BASIC);
 }
 
 ShelfTooltipManager::~ShelfTooltipManager() {
   ShellPort::Get()->RemovePointerWatcher(this);
-  shelf_view_->wm_shelf()->RemoveObserver(this);
+  shelf_view_->shelf()->RemoveObserver(this);
   WmWindow* window = nullptr;
   if (shelf_view_->GetWidget())
     window = WmWindow::Get(shelf_view_->GetWidget()->GetNativeWindow());
   if (window)
     window->RemoveLimitedPreTargetHandler(this);
 }
 
 void ShelfTooltipManager::Init() {
   WmWindow* window = WmWindow::Get(shelf_view_->GetWidget()->GetNativeWindow());
   window->AddLimitedPreTargetHandler(this);
@@ skipping 20 matching lines @@
     // Cancel the hiding animation to hide the old bubble immediately.
     WmWindow::Get(bubble_->GetWidget()->GetNativeWindow())
         ->SetVisibilityAnimationTransition(::wm::ANIMATE_NONE);
     Close();
   }
 
   if (!ShouldShowTooltipForView(view))
     return;
 
   views::BubbleBorder::Arrow arrow = views::BubbleBorder::Arrow::NONE;
-  switch (shelf_view_->wm_shelf()->GetAlignment()) {
+  switch (shelf_view_->shelf()->alignment()) {
     case SHELF_ALIGNMENT_BOTTOM:
     case SHELF_ALIGNMENT_BOTTOM_LOCKED:
       arrow = views::BubbleBorder::BOTTOM_CENTER;
       break;
     case SHELF_ALIGNMENT_LEFT:
       arrow = views::BubbleBorder::LEFT_CENTER;
       break;
     case SHELF_ALIGNMENT_RIGHT:
       arrow = views::BubbleBorder::RIGHT_CENTER;
       break;
@@ skipping 60 matching lines @@
     // AutoHide state change happens during an event filter, so immediate close
     // may cause a crash in the HandleMouseEvent() after the filter.  So we just
     // schedule the Close here.
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(&ShelfTooltipManager::Close, weak_factory_.GetWeakPtr()));
   }
 }
 
 bool ShelfTooltipManager::ShouldShowTooltipForView(views::View* view) {
-  WmShelf* shelf = shelf_view_ ? shelf_view_->wm_shelf() : nullptr;
+  Shelf* shelf = shelf_view_ ? shelf_view_->shelf() : nullptr;
   return shelf && shelf_view_->ShouldShowTooltipForView(view) &&
          (shelf->GetVisibilityState() == SHELF_VISIBLE ||
           (shelf->GetVisibilityState() == SHELF_AUTO_HIDE &&
            shelf->GetAutoHideState() == SHELF_AUTO_HIDE_SHOWN));
 }
 
 }  // namespace ash