ash: Clean up shelf GetAlignment() and IsHorizontalAlignment() calls

ash/common/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/common/shelf/shelf_widget.h"
 
 #include "ash/common/focus_cycler.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/app_list_button.h"
@@ skipping 202 matching lines @@
   SchedulePaint();
 }
 
 ShelfWidget::ShelfWidget(WmWindow* shelf_container, WmShelf* wm_shelf)
     : wm_shelf_(wm_shelf),
       status_area_widget_(nullptr),
       delegate_view_(new DelegateView(wm_shelf, this)),
       shelf_view_(nullptr),
       background_animator_(SHELF_BACKGROUND_DEFAULT, wm_shelf_),
       activating_as_fallback_(false) {
+  DCHECK(wm_shelf_);
   background_animator_.AddObserver(this);
   background_animator_.AddObserver(delegate_view_);
 
   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()
@@ skipping 64 matching lines @@
   opaque_foreground_animation->SetPreemptionStrategy(
       ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS);
 
   opaque_foreground->SetOpacity(target_opacity);
 }
 
 bool ShelfWidget::IsShelfHiddenBehindBlackBar() const {
   return delegate_view_->opaque_foreground()->GetTargetOpacity() != 0.0f;
 }
 
-ShelfAlignment ShelfWidget::GetAlignment() const {
-  return wm_shelf_->GetAlignment();
-}
-
 void ShelfWidget::OnShelfAlignmentChanged() {
   shelf_view_->OnShelfAlignmentChanged();
-  status_area_widget_->SetShelfAlignment(GetAlignment());
+  // TODO(jamescook): Status area should not cache alignment.
+  status_area_widget_->SetShelfAlignment(wm_shelf_->GetAlignment());
   delegate_view_->SchedulePaint();
 }
 
 ShelfView* ShelfWidget::CreateShelfView() {
   DCHECK(!shelf_view_);
 
   shelf_view_ =
       new ShelfView(WmShell::Get()->shelf_model(),
                     WmShell::Get()->shelf_delegate(), wm_shelf_, this);
   shelf_view_->Init();
@@ skipping 112 matching lines @@
   if (shelf_view_)
     shelf_view_->UpdateShelfItemBackground(alpha);
 }
 
 void ShelfWidget::WillDeleteShelfLayoutManager() {
   shelf_layout_manager_->RemoveObserver(this);
   shelf_layout_manager_ = nullptr;
 }
 
 }  // namespace ash