chromeos: Rename ash::WmShelf to Shelf

ash/shelf/shelf_widget.cc

 // Copyright 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/shelf/shelf_widget.h"
 
 #include "ash/animation/animation_change_type.h"
 #include "ash/focus_cycler.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
 #include "ash/shelf/app_list_button.h"
+#include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_background_animator_observer.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_view.h"
-#include "ash/shelf/wm_shelf.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_layout_manager.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/wm_window.h"
 #include "base/memory/ptr_util.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/layout/fill_layout.h"
@@ skipping 87 matching lines @@
 
 void ShelfWidget::DelegateView::OnBoundsChanged(const gfx::Rect& old_bounds) {
   opaque_background_.SetBounds(GetLocalBounds());
   opaque_foreground_.SetBounds(GetLocalBounds());
 }
 
 void ShelfWidget::DelegateView::UpdateShelfBackground(SkColor color) {
   opaque_background_.SetColor(color);
 }
 
-ShelfWidget::ShelfWidget(WmWindow* shelf_container, WmShelf* wm_shelf)
-    : wm_shelf_(wm_shelf),
+ShelfWidget::ShelfWidget(WmWindow* shelf_container, Shelf* shelf)
+    : shelf_(shelf),
       status_area_widget_(nullptr),
       delegate_view_(new DelegateView(this)),
-      shelf_view_(new ShelfView(Shell::Get()->shelf_model(), wm_shelf_, this)),
+      shelf_view_(new ShelfView(Shell::Get()->shelf_model(), shelf_, this)),
       background_animator_(SHELF_BACKGROUND_DEFAULT,
-                           wm_shelf_,
+                           shelf_,
                            Shell::Get()->wallpaper_controller()),
       activating_as_fallback_(false) {
   DCHECK(shelf_container);
-  DCHECK(wm_shelf_);
+  DCHECK(shelf_);
 
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.name = "ShelfWidget";
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.delegate = delegate_view_;
   shelf_container->GetRootWindowController()
       ->ConfigureWidgetInitParamsForContainer(
           this, shelf_container->aura_window()->id(), &params);
   Init(params);
 
   // The shelf should not take focus when initially shown.
   set_focus_on_creation(false);
   SetContentsView(delegate_view_);
   delegate_view_->SetParentLayer(GetLayer());
 
   // The shelf view observes the shelf model and creates icons as items are
   // added to the model.
   shelf_view_->Init();
   GetContentsView()->AddChildView(shelf_view_);
 
-  shelf_layout_manager_ = new ShelfLayoutManager(this, wm_shelf_);
+  shelf_layout_manager_ = new ShelfLayoutManager(this, shelf_);
   shelf_layout_manager_->AddObserver(this);
   shelf_container->aura_window()->SetLayoutManager(shelf_layout_manager_);
   background_animator_.PaintBackground(
       shelf_layout_manager_->GetShelfBackgroundType(),
       AnimationChangeType::IMMEDIATE);
 
   views::Widget::AddObserver(this);
 
   // Calls back into |this| and depends on |shelf_view_|.
   background_animator_.AddObserver(this);
   background_animator_.AddObserver(delegate_view_);
 }
 
 ShelfWidget::~ShelfWidget() {
   // Must call Shutdown() before destruction.
   DCHECK(!status_area_widget_);
   background_animator_.RemoveObserver(delegate_view_);
   background_animator_.RemoveObserver(this);
   Shell::Get()->focus_cycler()->RemoveWidget(this);
   SetFocusCycler(nullptr);
   RemoveObserver(this);
 }
 
 void ShelfWidget::CreateStatusAreaWidget(WmWindow* status_container) {
   DCHECK(status_container);
   DCHECK(!status_area_widget_);
   status_area_widget_ =
-      new StatusAreaWidget(status_container->aura_window(), wm_shelf_);
+      new StatusAreaWidget(status_container->aura_window(), shelf_);
   status_area_widget_->CreateTrayViews();
   // NOTE: Container may be hidden depending on login/display state.
   status_area_widget_->Show();
   Shell::Get()->focus_cycler()->AddWidget(status_area_widget_);
   background_animator_.AddObserver(status_area_widget_);
   status_container->aura_window()->SetLayoutManager(
       new StatusAreaLayoutManager(this));
 }
 
 void ShelfWidget::SetPaintsBackground(ShelfBackgroundType background_type,
@@ skipping 130 matching lines @@
 void ShelfWidget::UpdateShelfItemBackground(SkColor color) {
   shelf_view_->UpdateShelfItemBackground(color);
 }
 
 void ShelfWidget::WillDeleteShelfLayoutManager() {
   shelf_layout_manager_->RemoveObserver(this);
   shelf_layout_manager_ = nullptr;
 }
 
 }  // namespace ash