mash: Convert AshPopupAlignmentDelegate to wm common types

ash/aura/wm_shelf_aura.cc

 // Copyright 2016 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/aura/wm_shelf_aura.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/wm_shelf_observer.h"
 #include "ash/common/wm_window.h"
 #include "ash/shelf/shelf.h"
@@ skipping 34 matching lines @@
 }
 
 void WmShelfAura::ResetShelfLayoutManager() {
   if (!shelf_layout_manager_)
     return;
   shelf_layout_manager_->RemoveObserver(this);
   shelf_layout_manager_ = nullptr;
 }
 
 WmWindow* WmShelfAura::GetWindow() {
-  return WmWindowAura::Get(shelf_->shelf_widget()->GetNativeView());
+  // Use |shelf_layout_manager_| to access ShelfWidget because it is set
+  // before |shelf_| is available.
+  return shelf_layout_manager_
+             ? WmWindowAura::Get(
+                   shelf_layout_manager_->shelf_widget()->GetNativeView())
+             : nullptr;
 }
 
 ShelfAlignment WmShelfAura::GetAlignment() const {
-  return shelf_->alignment();
+  return shelf_ ? shelf_->alignment() : SHELF_ALIGNMENT_BOTTOM_LOCKED;
 }
 
 void WmShelfAura::SetAlignment(ShelfAlignment alignment) {
   shelf_->SetAlignment(alignment);

[msw, 2016/06/16 18:56:48]

nit: null checks in setters, etc. too?

[James Cook, 2016/06/16 21:08:14]

Actually, I went the other way and only added the null checks that I absolutely
needed. In general I would prefer a setter to crash if called too early, rather
than do nothing. I'd like the getters to do that too, but I can't do that in
some cases.

 }
 
 ShelfAutoHideBehavior WmShelfAura::GetAutoHideBehavior() const {
-  return shelf_->auto_hide_behavior();
+  return shelf_ ? shelf_->auto_hide_behavior() : SHELF_AUTO_HIDE_BEHAVIOR_NEVER;
 }
 
 void WmShelfAura::SetAutoHideBehavior(ShelfAutoHideBehavior behavior) {
   shelf_->SetAutoHideBehavior(behavior);
 }
 
+ShelfAutoHideState WmShelfAura::GetAutoHideState() const {
+  return shelf_layout_manager_ ? shelf_layout_manager_->auto_hide_state()
+                               : SHELF_AUTO_HIDE_SHOWN;
+}
+
 ShelfBackgroundType WmShelfAura::GetBackgroundType() const {
-  return shelf_->shelf_widget()->GetBackgroundType();
+  return shelf_layout_manager_
+             ? shelf_layout_manager_->shelf_widget()->GetBackgroundType()
+             : SHELF_BACKGROUND_DEFAULT;
 }
 
 void WmShelfAura::UpdateVisibilityState() {
   shelf_->shelf_layout_manager()->UpdateVisibilityState();
 }
 
 ShelfVisibilityState WmShelfAura::GetVisibilityState() const {
   return shelf_layout_manager_ ? shelf_layout_manager_->visibility_state()
                                : SHELF_HIDDEN;
 }
 
+gfx::Rect WmShelfAura::GetUserWorkAreaBounds() const {
+  return shelf_layout_manager_ ? shelf_layout_manager_->user_work_area_bounds()
+                               : gfx::Rect();
+}
+
 void WmShelfAura::UpdateIconPositionForWindow(WmWindow* window) {
   shelf_->UpdateIconPositionForWindow(WmWindowAura::GetAuraWindow(window));
 }
 
 gfx::Rect WmShelfAura::GetScreenBoundsOfItemIconForWindow(WmWindow* window) {
   return shelf_->GetScreenBoundsOfItemIconForWindow(
       WmWindowAura::GetAuraWindow(window));
 }
 
 void WmShelfAura::AddObserver(WmShelfObserver* observer) {
@@ skipping 13 matching lines @@
     BackgroundAnimatorChangeType change_type) {
   FOR_EACH_OBSERVER(WmShelfObserver, observers_,
                     OnBackgroundUpdated(background_type, change_type));
 }
 
 void WmShelfAura::WillChangeVisibilityState(ShelfVisibilityState new_state) {
   FOR_EACH_OBSERVER(WmShelfObserver, observers_,
                     WillChangeVisibilityState(new_state));
 }
 
+void WmShelfAura::OnAutoHideStateChanged(ShelfAutoHideState new_state) {
+  FOR_EACH_OBSERVER(WmShelfObserver, observers_,
+                    OnAutoHideStateChanged(new_state));
+}
+
 void WmShelfAura::OnShelfIconPositionsChanged() {
   FOR_EACH_OBSERVER(WmShelfObserver, observers_, OnShelfIconPositionsChanged());
 }
 
 }  // namespace ash