Refactor: Shelf Widget

ash/shelf/shelf_layout_manager.cc

 // Copyright (c) 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/wm/shelf_layout_manager.h"
+#include "ash/shelf/shelf_layout_manager.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "ash/ash_switches.h"
 #include "ash/launcher/launcher.h"
+#include "ash/launcher/launcher_types.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
+#include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
 #include "ash/wm/workspace/workspace_animations.h"
 #include "base/auto_reset.h"
@@ skipping 115 matching lines @@
   }
 
   // Shelf we're in. NULL if deleted before we're deleted.
   ShelfLayoutManager* shelf_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdateShelfObserver);
 };
 
 // ShelfLayoutManager ----------------------------------------------------------
 
-ShelfLayoutManager::ShelfLayoutManager(StatusAreaWidget* status_area_widget)
-    : root_window_(status_area_widget->GetNativeView()->GetRootWindow()),
+ShelfLayoutManager::ShelfLayoutManager(ShelfWidget* shelf)
+    : root_window_(shelf->GetNativeView()->GetRootWindow()),
       in_layout_(false),
       auto_hide_behavior_(SHELF_AUTO_HIDE_BEHAVIOR_NEVER),
       alignment_(SHELF_ALIGNMENT_BOTTOM),
-      launcher_(NULL),
-      status_area_widget_(status_area_widget),
+      shelf_(shelf),
       workspace_controller_(NULL),
       window_overlaps_shelf_(false),
       gesture_drag_status_(GESTURE_DRAG_NONE),
       gesture_drag_amount_(0.f),
       gesture_drag_auto_hide_state_(SHELF_AUTO_HIDE_SHOWN),
       update_shelf_observer_(NULL) {
   Shell::GetInstance()->AddShellObserver(this);
   aura::client::GetActivationClient(root_window_)->AddObserver(this);
 }
 
 ShelfLayoutManager::~ShelfLayoutManager() {
   if (update_shelf_observer_)
     update_shelf_observer_->Detach();
 
   FOR_EACH_OBSERVER(Observer, observers_, WillDeleteShelf());
   Shell::GetInstance()->RemoveShellObserver(this);
   aura::client::GetActivationClient(root_window_)->RemoveObserver(this);
 }
 
 void ShelfLayoutManager::SetAutoHideBehavior(ShelfAutoHideBehavior behavior) {
   if (auto_hide_behavior_ == behavior)
     return;
   auto_hide_behavior_ = behavior;
   UpdateVisibilityState();
   FOR_EACH_OBSERVER(Observer, observers_,
                     OnAutoHideStateChanged(state_.auto_hide_state));
 }
 
 bool ShelfLayoutManager::IsVisible() const {
-  return status_area_widget_->IsVisible() &&
+  return shelf_->status_area_widget()->IsVisible() &&
       (state_.visibility_state == SHELF_VISIBLE ||
        (state_.visibility_state == SHELF_AUTO_HIDE &&
         state_.auto_hide_state == SHELF_AUTO_HIDE_SHOWN));
 }
 
-void ShelfLayoutManager::SetLauncher(Launcher* launcher) {
-  if (launcher == launcher_)
-    return;
-
-  launcher_ = launcher;
-  if (launcher_)
-    launcher_->SetAlignment(alignment_);
-  LayoutShelf();
-}
-
 bool ShelfLayoutManager::SetAlignment(ShelfAlignment alignment) {
   if (alignment_ == alignment)
     return false;
 
   alignment_ = alignment;
-  if (launcher_)
-    launcher_->SetAlignment(alignment);
-  status_area_widget_->SetShelfAlignment(alignment);
+  if (shelf_->launcher())
+    shelf_->launcher()->SetAlignment(alignment);
+  shelf_->status_area_widget()->SetShelfAlignment(alignment);
   LayoutShelf();
   return true;
 }
 
 gfx::Rect ShelfLayoutManager::GetIdealBounds() {
   // TODO(oshima): this is wrong. Figure out what display shelf is on
   // and everything should be based on it.
-  gfx::Rect bounds(ScreenAsh::GetDisplayBoundsInParent(
-      status_area_widget_->GetNativeView()));
+  gfx::Rect bounds(
+      ScreenAsh::GetDisplayBoundsInParent(shelf_->GetNativeView()));
   int width = 0, height = 0;
   GetShelfSize(&width, &height);
   return SelectValueForShelfAlignment(
       gfx::Rect(bounds.x(), bounds.bottom() - height, bounds.width(), height),
       gfx::Rect(bounds.x(), bounds.y(), width, bounds.height()),
       gfx::Rect(bounds.right() - width, bounds.y(), width, bounds.height()),
       gfx::Rect(bounds.x(), bounds.y(), bounds.width(), height));
 }
 
 void ShelfLayoutManager::LayoutShelf() {
   base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true);
   StopAnimating();
   TargetBounds target_bounds;
   CalculateTargetBounds(state_, &target_bounds);
-  if (launcher_widget()) {
-    GetLayer(launcher_widget())->SetOpacity(target_bounds.opacity);
-    launcher_->SetWidgetBounds(
-        ScreenAsh::ConvertRectToScreen(
-            launcher_widget()->GetNativeView()->parent(),
-            target_bounds.launcher_bounds_in_root));
-    launcher_->SetStatusSize(target_bounds.status_bounds_in_root.size());
+  GetLayer(shelf_)->SetOpacity(target_bounds.opacity);
+  shelf_->SetBounds(
+      ScreenAsh::ConvertRectToScreen(
+          shelf_->GetNativeView()->parent(),
+          target_bounds.shelf_bounds_in_root));
+  if (shelf_->launcher()) {
+    shelf_->launcher()->SetViewBounds(target_bounds.launcher_bounds_in_shelf);
   }

[Mr4D (OOO till 08-26), 2013/03/02 02:02:12]

These brackets are unnecessary

[Harry McCleave, 2013/03/04 02:47:41]

Done.

-  GetLayer(status_area_widget_)->SetOpacity(target_bounds.opacity);
-  status_area_widget_->SetBounds(
+  GetLayer(shelf_->status_area_widget())->SetOpacity(target_bounds.opacity);
+  // TODO(harrym): Once status area widget is a child view of shelf
+  // this can be simplified.
+  gfx::Rect status_bounds = target_bounds.status_bounds_in_shelf;
+  status_bounds.set_x(status_bounds.x() +
+                      target_bounds.shelf_bounds_in_root.x());
+  status_bounds.set_y(status_bounds.y() +
+                      target_bounds.shelf_bounds_in_root.y());
+  shelf_->status_area_widget()->SetBounds(
       ScreenAsh::ConvertRectToScreen(
-          status_area_widget_->GetNativeView()->parent(),
-          target_bounds.status_bounds_in_root));
+          shelf_->status_area_widget()->GetNativeView()->parent(),
+          status_bounds));
   Shell::GetInstance()->SetDisplayWorkAreaInsets(
       root_window_, target_bounds.work_area_insets);
   UpdateHitTestBounds();
 }
 
 ShelfVisibilityState ShelfLayoutManager::CalculateShelfVisibility() {
   switch(auto_hide_behavior_) {
     case SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS:
       return SHELF_AUTO_HIDE;
     case SHELF_AUTO_HIDE_BEHAVIOR_NEVER:
@@ skipping 102 matching lines @@
   bool horizontal = IsHorizontalAlignment();
   gesture_drag_amount_ += horizontal ? gesture.details().scroll_y() :
                                        gesture.details().scroll_x();
   LayoutShelf();
 
   // Start reveling the status menu when:
   //   - dragging up on an already visible shelf
   //   - dragging up on a hidden shelf, but it is currently completely visible.
   if (horizontal && gesture.details().scroll_y() < 0) {
     int min_height = 0;
-    if (gesture_drag_auto_hide_state_ == SHELF_AUTO_HIDE_HIDDEN &&
-        launcher_widget())
-      min_height = launcher_widget()->GetContentsView()->
-          GetPreferredSize().height();
+    if (gesture_drag_auto_hide_state_ == SHELF_AUTO_HIDE_HIDDEN && shelf_)
+      min_height = shelf_->GetContentsView()->GetPreferredSize().height();
 
-    if (min_height < launcher_widget()->GetWindowBoundsInScreen().height() &&
+    if (min_height < shelf_->GetWindowBoundsInScreen().height() &&
         gesture.root_location().x() >=
-        status_area_widget_->GetWindowBoundsInScreen().x() &&
+        shelf_->status_area_widget()->GetWindowBoundsInScreen().x() &&
         IsDraggingTrayEnabled())
       return DRAG_TRAY;
   }
 
   return DRAG_SHELF;
 }
 
 void ShelfLayoutManager::CompleteGestureDrag(const ui::GestureEvent& gesture) {
   bool horizontal = IsHorizontalAlignment();
   bool should_change = false;
@@ skipping 37 matching lines @@
   }
 
   if (!should_change) {
     CancelGestureDrag();
     return;
   }
 
   gesture_drag_auto_hide_state_ =
       gesture_drag_auto_hide_state_ == SHELF_AUTO_HIDE_SHOWN ?
       SHELF_AUTO_HIDE_HIDDEN : SHELF_AUTO_HIDE_SHOWN;
-  if (launcher_widget())
-    launcher_widget()->Deactivate();
-  status_area_widget_->Deactivate();
+  if (shelf_)
+    shelf_->Deactivate();
+  shelf_->status_area_widget()->Deactivate();
   if (gesture_drag_auto_hide_state_ == SHELF_AUTO_HIDE_HIDDEN &&
       auto_hide_behavior_ != SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS) {
     gesture_drag_status_ = GESTURE_DRAG_NONE;
     SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
   } else if (gesture_drag_auto_hide_state_ == SHELF_AUTO_HIDE_SHOWN &&
              auto_hide_behavior_ != SHELF_AUTO_HIDE_BEHAVIOR_NEVER) {
     gesture_drag_status_ = GESTURE_DRAG_NONE;
     SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
   } else {
     gesture_drag_status_ = GESTURE_DRAG_COMPLETE_IN_PROGRESS;
     UpdateVisibilityState();
     gesture_drag_status_ = GESTURE_DRAG_NONE;
   }
 }
 
 void ShelfLayoutManager::CancelGestureDrag() {
   gesture_drag_status_ = GESTURE_DRAG_NONE;
   ui::ScopedLayerAnimationSettings
-      launcher_settings(GetLayer(launcher_widget())->GetAnimator()),
-      status_settings(GetLayer(status_area_widget_)->GetAnimator());
+      launcher_settings(GetLayer(shelf_)->GetAnimator()),
+      status_settings(GetLayer(shelf_->status_area_widget())->GetAnimator());
   LayoutShelf();
   UpdateVisibilityState();
   UpdateShelfBackground(BackgroundAnimator::CHANGE_ANIMATE);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ShelfLayoutManager, aura::LayoutManager implementation:
 
 void ShelfLayoutManager::OnWindowResized() {
   LayoutShelf();
@@ skipping 11 matching lines @@
 void ShelfLayoutManager::OnChildWindowVisibilityChanged(aura::Window* child,
                                                         bool visible) {
 }
 
 void ShelfLayoutManager::SetChildBounds(aura::Window* child,
                                         const gfx::Rect& requested_bounds) {
   SetChildBoundsDirect(child, requested_bounds);
   // We may contain other widgets (such as frame maximize bubble) but they don't
   // effect the layout in anyway.
   if (!in_layout_ &&
-      ((launcher_widget() && launcher_widget()->GetNativeView() == child) ||
-       (status_area_widget_->GetNativeView() == child))) {
+      ((shelf_ && shelf_->GetNativeView() == child) ||
+       (shelf_->status_area_widget()->GetNativeView() == child))) {
     LayoutShelf();
   }
 }
 
 void ShelfLayoutManager::OnLockStateChanged(bool locked) {
   UpdateVisibilityState();
 }
 
 void ShelfLayoutManager::OnWindowActivated(aura::Window* gained_active,
                                            aura::Window* lost_active) {
   UpdateAutoHideStateNow();
 }
 
 bool ShelfLayoutManager::IsHorizontalAlignment() const {
   return alignment_ == SHELF_ALIGNMENT_BOTTOM ||
          alignment_ == SHELF_ALIGNMENT_TOP;
 }
 
 // static
 ShelfLayoutManager* ShelfLayoutManager::ForLauncher(aura::Window* window) {
-  return RootWindowController::ForLauncher(window)->shelf();
+  if (RootWindowController::ForLauncher(window)->shelf())

[Mr4D (OOO till 08-26), 2013/03/02 02:02:12]

You might want to assign this to a variable to avoid calling this thing twice.

[Harry McCleave, 2013/03/04 02:47:41]

Done.

+    return RootWindowController::ForLauncher(window)->
+        shelf()->shelf_layout_manager();
+  return NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ShelfLayoutManager, private:
 
 ShelfLayoutManager::TargetBounds::TargetBounds() : opacity(0.0f) {}
 
 void ShelfLayoutManager::SetState(ShelfVisibilityState visibility_state) {
   ShellDelegate* delegate = Shell::GetInstance()->delegate();
   State state;
   state.visibility_state = visibility_state;
   state.auto_hide_state = CalculateAutoHideState(visibility_state);
   state.is_screen_locked = delegate && delegate->IsScreenLocked();
 
   // It's possible for SetState() when a window becomes maximized but the state
   // won't have changed value. Do the dimming check before the early exit.
-  if (launcher_ && workspace_controller_) {
-    launcher_->SetDimsShelf(
+  if (shelf_ && workspace_controller_) {
+    shelf_->SetDimsShelf(
         (state.visibility_state == SHELF_VISIBLE) &&
           workspace_controller_->GetWindowState() ==
               WORKSPACE_WINDOW_STATE_MAXIMIZED);
   }
 
   if (state_.Equals(state))
     return;  // Nothing changed.
 
   FOR_EACH_OBSERVER(Observer, observers_,
                     WillChangeVisibilityState(visibility_state));
@@ skipping 15 matching lines @@
       (state_.visibility_state == SHELF_AUTO_HIDE &&
        state_.auto_hide_state == SHELF_AUTO_HIDE_HIDDEN &&
        state.visibility_state == SHELF_VISIBLE) ?
       BackgroundAnimator::CHANGE_IMMEDIATE : BackgroundAnimator::CHANGE_ANIMATE;
   StopAnimating();
 
   State old_state = state_;
   state_ = state;
   TargetBounds target_bounds;
   CalculateTargetBounds(state_, &target_bounds);
-  if (launcher_widget()) {
-    ui::ScopedLayerAnimationSettings launcher_animation_setter(
-        GetLayer(launcher_widget())->GetAnimator());
-    launcher_animation_setter.SetTransitionDuration(
-        base::TimeDelta::FromMilliseconds(kWorkspaceSwitchTimeMS));
-    launcher_animation_setter.SetTweenType(ui::Tween::EASE_OUT);
-    GetLayer(launcher_widget())->SetBounds(
-        target_bounds.launcher_bounds_in_root);
-    GetLayer(launcher_widget())->SetOpacity(target_bounds.opacity);
-  }
+
+  ui::ScopedLayerAnimationSettings launcher_animation_setter(

[Mr4D (OOO till 08-26), 2013/03/02 02:02:12]

According to line 524 shelf_ can get NULL (as launcher_widget() was able to). I
guess you should add a test to several of the following lines? If that is not
required - you should be able to remove the test above as well?

[Harry McCleave, 2013/03/04 02:47:41]

Done.

+      GetLayer(shelf_)->GetAnimator());
+  launcher_animation_setter.SetTransitionDuration(
+      base::TimeDelta::FromMilliseconds(kWorkspaceSwitchTimeMS));
+  launcher_animation_setter.SetTweenType(ui::Tween::EASE_OUT);
+  GetLayer(shelf_)->SetBounds(
+      target_bounds.shelf_bounds_in_root);
+  GetLayer(shelf_)->SetOpacity(target_bounds.opacity);
   ui::ScopedLayerAnimationSettings status_animation_setter(
-      GetLayer(status_area_widget_)->GetAnimator());
+      GetLayer(shelf_->status_area_widget())->GetAnimator());
   status_animation_setter.SetTransitionDuration(
       base::TimeDelta::FromMilliseconds(kWorkspaceSwitchTimeMS));
   status_animation_setter.SetTweenType(ui::Tween::EASE_OUT);
 
   // Delay updating the background when going from SHELF_AUTO_HIDE_SHOWN to
   // SHELF_AUTO_HIDE_HIDDEN until the shelf animates out. Otherwise during the
   // animation you see the background change.
   // Also delay the animation when the shelf was hidden, and has just been made
   // visible (e.g. using a gesture-drag).
   bool delay_shelf_update =
       state.visibility_state == SHELF_AUTO_HIDE &&
       state.auto_hide_state == SHELF_AUTO_HIDE_HIDDEN &&
       old_state.visibility_state == SHELF_AUTO_HIDE;
 
   if (state.visibility_state == SHELF_VISIBLE &&
       old_state.visibility_state == SHELF_AUTO_HIDE &&
       old_state.auto_hide_state == SHELF_AUTO_HIDE_HIDDEN)
     delay_shelf_update = true;
 
   if (delay_shelf_update) {
     if (update_shelf_observer_)
       update_shelf_observer_->Detach();
     // UpdateShelfBackground deletes itself when the animation is done.
     update_shelf_observer_ = new UpdateShelfObserver(this);
     status_animation_setter.AddObserver(update_shelf_observer_);
   }
-  ui::Layer* layer = GetLayer(status_area_widget_);
-  layer->SetBounds(target_bounds.status_bounds_in_root);
+  ui::Layer* layer = GetLayer(shelf_->status_area_widget());
+  // TODO(harrym): Remove when status_area is view.
+  gfx::Rect status_bounds = target_bounds.status_bounds_in_shelf;
+  status_bounds.set_x(status_bounds.x() +
+                      target_bounds.shelf_bounds_in_root.x());
+  status_bounds.set_y(status_bounds.y() +
+                      target_bounds.shelf_bounds_in_root.y());
+  layer->SetBounds(status_bounds);
   layer->SetOpacity(target_bounds.opacity);
   Shell::GetInstance()->SetDisplayWorkAreaInsets(
       root_window_, target_bounds.work_area_insets);
   UpdateHitTestBounds();
   if (!delay_shelf_update)
     UpdateShelfBackground(change_type);
 }
 
 void ShelfLayoutManager::StopAnimating() {
-  ui::Layer* layer = GetLayer(status_area_widget_);
-  if (launcher_widget())
-    layer->GetAnimator()->StopAnimating();
-  layer->GetAnimator()->StopAnimating();
+  GetLayer(shelf_)->GetAnimator()->StopAnimating();
+  GetLayer(shelf_->status_area_widget())->GetAnimator()->StopAnimating();
 }
 
 void ShelfLayoutManager::GetShelfSize(int* width, int* height) {
   *width = *height = 0;
-  gfx::Size status_size(status_area_widget_->GetWindowBoundsInScreen().size());
-  gfx::Size launcher_size = launcher_ ?
-      launcher_widget()->GetContentsView()->GetPreferredSize() : gfx::Size();
-  if (IsHorizontalAlignment())
-    *height = std::max(launcher_size.height(), status_size.height());
-  else
-    *width = std::max(launcher_size.width(), status_size.width());
+  gfx::Size status_size(
+      shelf_->status_area_widget()->GetWindowBoundsInScreen().size());
+  if (IsHorizontalAlignment()) {
+    *height = std::max(kLauncherPreferredSize, status_size.height());
+  } else {

[Mr4D (OOO till 08-26), 2013/03/02 02:02:12]

These brackets are not necessary - see on the left.

[Harry McCleave, 2013/03/04 02:47:41]

Done.

+    *width = std::max(kLauncherPreferredSize, status_size.width());
+  }
 }
 
 void ShelfLayoutManager::AdjustBoundsBasedOnAlignment(int inset,
                                                       gfx::Rect* bounds) const {
   bounds->Inset(SelectValueForShelfAlignment(
       gfx::Insets(0, 0, inset, 0),
       gfx::Insets(0, inset, 0, 0),
       gfx::Insets(0, 0, 0, inset),
       gfx::Insets(inset, 0, 0, 0)));
 }
 
 void ShelfLayoutManager::CalculateTargetBounds(
     const State& state,
     TargetBounds* target_bounds) {
   const gfx::Rect& available_bounds(root_window_->bounds());
-  gfx::Rect status_size(status_area_widget_->GetWindowBoundsInScreen().size());
-  gfx::Size launcher_size = launcher_ ?
-      launcher_widget()->GetContentsView()->GetPreferredSize() : gfx::Size();
-  int shelf_size = 0;
+  gfx::Rect status_size(
+      shelf_->status_area_widget()->GetWindowBoundsInScreen().size());
   int shelf_width = 0, shelf_height = 0;
   GetShelfSize(&shelf_width, &shelf_height);
-  if (state.visibility_state == SHELF_VISIBLE ||
-      (state.visibility_state == SHELF_AUTO_HIDE &&
-       state.auto_hide_state == SHELF_AUTO_HIDE_SHOWN)) {
-    shelf_size = std::max(shelf_width, shelf_height);
-    launcher_size.set_width(std::max(shelf_width,launcher_size.width()));
-    launcher_size.set_height(std::max(shelf_height,launcher_size.height()));
-  } else if (state.visibility_state == SHELF_AUTO_HIDE &&
-             state.auto_hide_state == SHELF_AUTO_HIDE_HIDDEN) {
-    shelf_size = kAutoHideSize;
+  if (IsHorizontalAlignment())
+    shelf_width = available_bounds.width();
+  else
+    shelf_height = available_bounds.height();
+
+  if (state.visibility_state == SHELF_AUTO_HIDE &&
+      state.auto_hide_state == SHELF_AUTO_HIDE_HIDDEN) {
     // Keep the launcher to its full height when dragging is in progress.
     if (gesture_drag_status_ == GESTURE_DRAG_NONE) {
       if (IsHorizontalAlignment())
-        launcher_size.set_height(kAutoHideSize);
+        shelf_height = kAutoHideSize;
       else
-        launcher_size.set_width(kAutoHideSize);
+        shelf_width = kAutoHideSize;
     }
+  } else if (state.visibility_state == SHELF_HIDDEN) {
+    if (IsHorizontalAlignment())
+      shelf_height = 0;
+    else
+      shelf_width = 0;
   }
-  switch(alignment_) {
-    case SHELF_ALIGNMENT_BOTTOM:
-      // The status widget should extend to the bottom and right edges.
-      target_bounds->status_bounds_in_root = gfx::Rect(
-          base::i18n::IsRTL() ? available_bounds.x() :
-              available_bounds.right() - status_size.width(),
-          available_bounds.bottom() - shelf_size + shelf_height -
-              status_size.height(),
-         status_size.width(), status_size.height());
-      if (launcher_widget())
-        target_bounds->launcher_bounds_in_root = gfx::Rect(
-            available_bounds.x(),
-            available_bounds.bottom() - shelf_size,
-            available_bounds.width(),
-            launcher_size.height());
-      target_bounds->work_area_insets.Set(
-          0, 0, GetWorkAreaSize(state, shelf_height), 0);
-      break;
-    case SHELF_ALIGNMENT_LEFT:
-      target_bounds->status_bounds_in_root = gfx::Rect(
-          available_bounds.x() + launcher_size.width() - status_size.width(),
-          available_bounds.bottom() - status_size.height(),
-          shelf_width, status_size.height());
-      if (launcher_widget())
-        target_bounds->launcher_bounds_in_root = gfx::Rect(
-            available_bounds.x(), available_bounds.y(),
-            launcher_size.width(), available_bounds.height());
-      target_bounds->work_area_insets.Set(
-          0, GetWorkAreaSize(state, launcher_size.width()), 0, 0);
-      break;
-    case SHELF_ALIGNMENT_RIGHT:
-      target_bounds->status_bounds_in_root = gfx::Rect(
-          available_bounds.right()- status_size.width() -
-              shelf_size + shelf_width,
-          available_bounds.bottom() - status_size.height(),
-          shelf_width, status_size.height());
-      if (launcher_widget())
-        target_bounds->launcher_bounds_in_root = gfx::Rect(
-            available_bounds.right() - launcher_size.width(),
-            available_bounds.y(),
-            launcher_size.width(), available_bounds.height());
-      target_bounds->work_area_insets.Set(
-          0, 0, 0, GetWorkAreaSize(state, launcher_size.width()));
-      break;
-    case SHELF_ALIGNMENT_TOP:
-      target_bounds->status_bounds_in_root = gfx::Rect(
-          base::i18n::IsRTL() ? available_bounds.x() :
-              available_bounds.right() - status_size.width(),
-          available_bounds.y() + launcher_size.height() - status_size.height(),
-         status_size.width(), status_size.height());
-      if (launcher_widget())
-        target_bounds->launcher_bounds_in_root = gfx::Rect(
-            available_bounds.x(),
-            available_bounds.y(),
-            available_bounds.width(),
-            launcher_size.height());
-      target_bounds->work_area_insets.Set(
-          GetWorkAreaSize(state, shelf_height), 0, 0, 0);
-      break;
-  }
+  target_bounds->shelf_bounds_in_root = SelectValueForShelfAlignment(
+      gfx::Rect(available_bounds.x(), available_bounds.bottom() - shelf_height,
+                    available_bounds.width(), shelf_height),
+      gfx::Rect(available_bounds.x(), available_bounds.y(),
+                    shelf_width, available_bounds.height()),
+      gfx::Rect(available_bounds.right() - shelf_width, available_bounds.y(),
+                    shelf_width, available_bounds.height()),
+      gfx::Rect(available_bounds.x(), available_bounds.y(),
+                    available_bounds.width(), shelf_height));
+
+  int status_inset = (kLauncherPreferredSize -
+      PrimaryAxisValue(status_size.height(), status_size.width()));
+
+  target_bounds->status_bounds_in_shelf = SelectValueForShelfAlignment(
+      gfx::Rect(base::i18n::IsRTL() ? 0 : shelf_width - status_size.width(),
+                    status_inset, status_size.width(), status_size.height()),
+      gfx::Rect(shelf_width - (status_size.width() + status_inset),
+                    shelf_height - status_size.height(), status_size.width(),
+                    status_size.height()),
+      gfx::Rect(status_inset, shelf_height - status_size.height(),
+                    status_size.width(), status_size.height()),
+      gfx::Rect(base::i18n::IsRTL() ? 0 : shelf_width - status_size.width(),
+                    shelf_height - (status_size.height() + status_inset),
+                    status_size.width(), status_size.height()));
+
+  target_bounds->launcher_bounds_in_shelf = SelectValueForShelfAlignment(
+      gfx::Rect(base::i18n::IsRTL() ? status_size.width() : 0, 0,
+                    shelf_width - status_size.width(), shelf_height),
+      gfx::Rect(0, 0, shelf_width, shelf_height - status_size.height()),
+      gfx::Rect(0, 0, shelf_width, shelf_height - status_size.height()),
+      gfx::Rect(base::i18n::IsRTL() ? status_size.width() : 0, 0,
+                    shelf_width - status_size.width(), shelf_height));
+
+  target_bounds->work_area_insets = SelectValueForShelfAlignment(
+      gfx::Insets(0, 0, GetWorkAreaSize(state, shelf_height), 0),
+      gfx::Insets(0, GetWorkAreaSize(state, shelf_width), 0, 0),
+      gfx::Insets(0, 0, 0, GetWorkAreaSize(state, shelf_width)),
+      gfx::Insets(GetWorkAreaSize(state, shelf_height), 0, 0, 0));
+
   target_bounds->opacity =
       (gesture_drag_status_ != GESTURE_DRAG_NONE ||
        state.visibility_state == SHELF_VISIBLE ||
        state.visibility_state == SHELF_AUTO_HIDE) ? 1.0f : 0.0f;
   if (gesture_drag_status_ == GESTURE_DRAG_IN_PROGRESS)
     UpdateTargetBoundsForGesture(target_bounds);
 }
 
 void ShelfLayoutManager::UpdateTargetBoundsForGesture(
     TargetBounds* target_bounds) const {
   CHECK_EQ(GESTURE_DRAG_IN_PROGRESS, gesture_drag_status_);
   bool horizontal = IsHorizontalAlignment();
   int resistance_free_region = 0;
 
   if (gesture_drag_auto_hide_state_ == SHELF_AUTO_HIDE_HIDDEN &&
       visibility_state() == SHELF_AUTO_HIDE &&
       auto_hide_state() != SHELF_AUTO_HIDE_SHOWN) {
     // If the shelf was hidden when the drag started (and the state hasn't
     // changed since then, e.g. because the tray-menu was shown because of the
     // drag), then allow the drag some resistance-free region at first to make
     // sure the shelf sticks with the finger until the shelf is visible.
     resistance_free_region += horizontal ?
-        target_bounds->launcher_bounds_in_root.height() :
-        target_bounds->launcher_bounds_in_root.width();
+        target_bounds->shelf_bounds_in_root.height() :
+        target_bounds->shelf_bounds_in_root.width();
     resistance_free_region -= kAutoHideSize;
   }
 
   bool resist = SelectValueForShelfAlignment(
       gesture_drag_amount_ < -resistance_free_region,
       gesture_drag_amount_ > resistance_free_region,
       gesture_drag_amount_ < -resistance_free_region,
       gesture_drag_amount_ > resistance_free_region);
 
   float translate = 0.f;
   if (resist) {
     float diff = fabsf(gesture_drag_amount_) - resistance_free_region;
     diff = std::min(diff, sqrtf(diff));
     if (gesture_drag_amount_ < 0)
       translate = -resistance_free_region - diff;
     else
       translate = resistance_free_region + diff;
   } else {
     translate = gesture_drag_amount_;
   }
 
   if (horizontal) {
     // Move the launcher with the gesture.
-    target_bounds->launcher_bounds_in_root.Offset(0, translate);
-    target_bounds->status_bounds_in_root.Offset(0, translate);
+    target_bounds->shelf_bounds_in_root.Offset(0, translate);
 
     if (translate < 0) {
       // When dragging up, the launcher height should increase.
       float move = std::max(translate,
                             -static_cast<float>(resistance_free_region));
-      target_bounds->launcher_bounds_in_root.set_height(
-          target_bounds->launcher_bounds_in_root.height() + move - translate);
+      target_bounds->shelf_bounds_in_root.set_height(
+          target_bounds->shelf_bounds_in_root.height() + move - translate);
+
+      // The statusbar should be in the center.
+      gfx::Rect status_y = target_bounds->shelf_bounds_in_root;
+      status_y.ClampToCenteredSize(
+          target_bounds->status_bounds_in_shelf.size());
+      target_bounds->status_bounds_in_shelf.set_y(status_y.y());
     }
   } else {
     // Move the launcher with the gesture.
     if (alignment_ == SHELF_ALIGNMENT_RIGHT)
-      target_bounds->launcher_bounds_in_root.Offset(translate, 0);
+      target_bounds->shelf_bounds_in_root.Offset(translate, 0);
 
     if ((translate > 0 && alignment_ == SHELF_ALIGNMENT_RIGHT) ||
         (translate < 0 && alignment_ == SHELF_ALIGNMENT_LEFT)) {
       // When dragging towards the edge, the statusbar should move.
-      target_bounds->status_bounds_in_root.Offset(translate, 0);
+      target_bounds->status_bounds_in_shelf.Offset(translate, 0);
     } else {
       // When dragging away from the edge, the launcher width should increase.
       float move = alignment_ == SHELF_ALIGNMENT_RIGHT ?
           std::max(translate, -static_cast<float>(resistance_free_region)) :
           std::min(translate, static_cast<float>(resistance_free_region));
 
       if (alignment_ == SHELF_ALIGNMENT_RIGHT) {
-        target_bounds->launcher_bounds_in_root.set_width(
-            target_bounds->launcher_bounds_in_root.width() + move - translate);
+        target_bounds->shelf_bounds_in_root.set_width(
+            target_bounds->shelf_bounds_in_root.width() + move - translate);
       } else {
-        target_bounds->launcher_bounds_in_root.set_width(
-            target_bounds->launcher_bounds_in_root.width() - move + translate);
+        target_bounds->shelf_bounds_in_root.set_width(
+            target_bounds->shelf_bounds_in_root.width() - move + translate);
       }
 
       // The statusbar should be in the center.
-      gfx::Rect status_x = target_bounds->launcher_bounds_in_root;
+      gfx::Rect status_x = target_bounds->shelf_bounds_in_root;
       status_x.ClampToCenteredSize(
-          target_bounds->status_bounds_in_root.size());
-      target_bounds->status_bounds_in_root.set_x(status_x.x());
+          target_bounds->status_bounds_in_shelf.size());
+      target_bounds->status_bounds_in_shelf.set_x(status_x.x());
     }
   }
 }
 
 void ShelfLayoutManager::UpdateShelfBackground(
     BackgroundAnimator::ChangeType type) {
   bool launcher_paints = GetLauncherPaintsBackground();
-  if (launcher_)
-    launcher_->SetPaintsBackground(launcher_paints, type);
-  // The status area normally draws a background, but we don't want it to draw a
-  // background when the launcher does or when we're at login/lock screen.
-  ShellDelegate* delegate = Shell::GetInstance()->delegate();
-  bool delegate_allows_tray_bg =
-      delegate->IsUserLoggedIn() && !delegate->IsScreenLocked();
-  bool status_area_paints = !launcher_paints && delegate_allows_tray_bg;
-  status_area_widget_->SetPaintsBackground(status_area_paints, type);
+  shelf_->SetPaintsBackground(launcher_paints, type);
 }
 
 bool ShelfLayoutManager::GetLauncherPaintsBackground() const {
   return gesture_drag_status_ != GESTURE_DRAG_NONE ||
       (!state_.is_screen_locked && window_overlaps_shelf_) ||
       (state_.visibility_state == SHELF_AUTO_HIDE) ;
 }
 
 void ShelfLayoutManager::UpdateAutoHideStateNow() {
   SetState(state_.visibility_state);
 }
 
 ShelfAutoHideState ShelfLayoutManager::CalculateAutoHideState(
     ShelfVisibilityState visibility_state) const {
-  if (visibility_state != SHELF_AUTO_HIDE || !launcher_widget())
+  if (visibility_state != SHELF_AUTO_HIDE || !shelf_)
     return SHELF_AUTO_HIDE_HIDDEN;
 
   if (gesture_drag_status_ == GESTURE_DRAG_COMPLETE_IN_PROGRESS)
     return gesture_drag_auto_hide_state_;
 
   Shell* shell = Shell::GetInstance();
   if (shell->GetAppListTargetVisibility())
     return SHELF_AUTO_HIDE_SHOWN;
 
-  if (status_area_widget_ && status_area_widget_->ShouldShowLauncher())
+  if (shelf_->status_area_widget() &&
+      shelf_->status_area_widget()->ShouldShowLauncher())
     return SHELF_AUTO_HIDE_SHOWN;
 
-  if (launcher_ && launcher_->IsShowingMenu())
+  if (shelf_->launcher() && shelf_->launcher()->IsShowingMenu())
     return SHELF_AUTO_HIDE_SHOWN;
 
-  if (launcher_ && launcher_->IsShowingOverflowBubble())
+  if (shelf_->launcher() && shelf_->launcher()->IsShowingOverflowBubble())
     return SHELF_AUTO_HIDE_SHOWN;
 
-  if (launcher_widget()->IsActive() || status_area_widget_->IsActive())
+  if (shelf_->IsActive() || shelf_->status_area_widget()->IsActive())
     return SHELF_AUTO_HIDE_SHOWN;
 
   // Don't show if the user is dragging the mouse.
   if (event_filter_.get() && event_filter_->in_mouse_drag())
     return SHELF_AUTO_HIDE_HIDDEN;
 
-  gfx::Rect shelf_region = launcher_widget()->GetWindowBoundsInScreen();
-  if (status_area_widget_ &&
-      status_area_widget_->IsMessageBubbleShown() &&
+  gfx::Rect shelf_region = shelf_->GetWindowBoundsInScreen();
+  if (shelf_->status_area_widget() &&
+      shelf_->status_area_widget()->IsMessageBubbleShown() &&
       IsVisible()) {
     // Increase the the hit test area to prevent the shelf from disappearing
     // when the mouse is over the bubble gap.
     shelf_region.Inset(alignment_ == SHELF_ALIGNMENT_RIGHT ?
                            -kNotificationBubbleGapHeight : 0,
                        alignment_ == SHELF_ALIGNMENT_BOTTOM ?
                            -kNotificationBubbleGapHeight : 0,
                        alignment_ == SHELF_ALIGNMENT_LEFT ?
                            -kNotificationBubbleGapHeight : 0,
                        alignment_ == SHELF_ALIGNMENT_TOP ?
@@ skipping 32 matching lines @@
         insets.Set(0, 0, 0, kWorkspaceAreaBottomInset);
         break;
       case SHELF_ALIGNMENT_RIGHT:
         insets.Set(0, kWorkspaceAreaBottomInset, 0, 0);
         break;
       case SHELF_ALIGNMENT_TOP:
         insets.Set(0, 0, kWorkspaceAreaBottomInset, 0);
         break;
     }
   }
-  if (launcher_widget() && launcher_widget()->GetNativeWindow()) {
-    launcher_widget()->GetNativeWindow()->SetHitTestBoundsOverrideOuter(
+  if (shelf_ && shelf_->GetNativeWindow()) {
+    shelf_->GetNativeWindow()->SetHitTestBoundsOverrideOuter(
         insets, 1);
   }
-  status_area_widget_->GetNativeWindow()->
+  shelf_->status_area_widget()->GetNativeWindow()->
       SetHitTestBoundsOverrideOuter(insets, 1);
 }
 
 bool ShelfLayoutManager::IsShelfWindow(aura::Window* window) {
   if (!window)
     return false;
-  return (launcher_widget() &&
-          launcher_widget()->GetNativeWindow()->Contains(window)) ||
-      (status_area_widget_->GetNativeWindow()->Contains(window));
+  return (shelf_ &&
+          shelf_->GetNativeWindow()->Contains(window)) ||
+      (shelf_->status_area_widget()->GetNativeWindow()->Contains(window));
 }
 
 int ShelfLayoutManager::GetWorkAreaSize(const State& state, int size) const {
   if (state.visibility_state == SHELF_VISIBLE)
     return size;
   if (state.visibility_state == SHELF_AUTO_HIDE)
     return kAutoHideSize;
   return 0;
 }
 
 }  // namespace internal
 }  // namespace ash