mash: Convert all of //ash/system to use WmShelf

ash/system/toast/toast_overlay.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/system/toast/toast_overlay.h"
 
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/screen_util.h"
-#include "ash/shelf/shelf.h"
-#include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/wm/window_animations.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "grit/ash_strings.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
@@ skipping 156 matching lines @@
   paint.setColor(kButtonBackgroundColor);
   canvas->DrawRoundRect(GetLocalBounds(), 2, paint);
   views::View::OnPaint(canvas);
 }
 
 gfx::Size ToastOverlayView::GetMinimumSize() const {
   return gfx::Size(kToastMinimumWidth, 0);
 }
 
 gfx::Size ToastOverlayView::GetMaximumSize() const {
-  ShelfLayoutManager* shelf_layout_manager =
-      Shelf::ForPrimaryDisplay()->shelf_layout_manager();
-  gfx::Rect work_area_bounds = shelf_layout_manager->user_work_area_bounds();
-
+  gfx::Rect work_area_bounds =
+      WmShelf::ForPrimaryDisplay()->GetUserWorkAreaBounds();

[msw, 2016/06/25 00:18:29]

aside: it seems like the shelf shouldn't be the source of work area bounds.

[James Cook, 2016/06/25 01:20:58]

Yeah, maybe it should be accessed via RootWindowController.

   return gfx::Size(kToastMaximumWidth, work_area_bounds.height() - kOffset * 2);
 }
 
 void ToastOverlayView::ButtonPressed(views::Button* sender,
                                      const ui::Event& event) {
   overlay_->Show(false);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 //  ToastOverlay
 ToastOverlay::ToastOverlay(Delegate* delegate,
                            const std::string& text,
                            const std::string& dismiss_text)
     : delegate_(delegate),
       text_(text),
       dismiss_text_(dismiss_text),
       overlay_view_(new ToastOverlayView(this, text, dismiss_text)),
       widget_size_(overlay_view_->GetPreferredSize()) {
   views::Widget::InitParams params;
   params.type = views::Widget::InitParams::TYPE_POPUP;
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.accept_events = true;
   params.keep_on_top = true;
   params.remove_standard_frame = true;
   params.bounds = CalculateOverlayBounds();
   // Show toasts above the app list and below the lock screen.
+  // TODO(jamescook): Either this should be the primary root window, or the
+  // work area bounds computation should be for the target root window.
   params.parent = Shell::GetContainer(Shell::GetTargetRootWindow(),
                                       kShellWindowId_SystemModalContainer);
   overlay_widget_.reset(new views::Widget);
   overlay_widget_->Init(params);
   overlay_widget_->SetVisibilityChangedAnimationsEnabled(true);
   overlay_widget_->SetContentsView(overlay_view_.get());
   overlay_widget_->SetBounds(CalculateOverlayBounds());
   overlay_widget_->GetNativeView()->SetName("ToastOverlay");
 
   gfx::NativeWindow native_view = overlay_widget_->GetNativeView();
@@ skipping 27 matching lines @@
     overlay_widget_->Show();
 
     // Notify accessibility about the overlay.
     overlay_view_->NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, false);
   } else {
     overlay_widget_->Hide();
   }
 }
 
 gfx::Rect ToastOverlay::CalculateOverlayBounds() {
-  ShelfLayoutManager* shelf_layout_manager =
-      Shelf::ForPrimaryDisplay()->shelf_layout_manager();
-
-  gfx::Rect bounds = shelf_layout_manager->user_work_area_bounds();
+  gfx::Rect bounds = WmShelf::ForPrimaryDisplay()->GetUserWorkAreaBounds();
   int target_y = bounds.bottom() - widget_size_.height() - kOffset;
   bounds.ClampToCenteredSize(widget_size_);
   bounds.set_y(target_y);
   return bounds;
 }
 
 void ToastOverlay::OnImplicitAnimationsScheduled() {}
 
 void ToastOverlay::OnImplicitAnimationsCompleted() {
   if (!overlay_widget_->GetLayer()->GetTargetVisibility())
     delegate_->OnClosed();
 }
 
 views::Widget* ToastOverlay::widget_for_testing() {
   return overlay_widget_.get();
 }
 
 void ToastOverlay::ClickDismissButtonForTesting(const ui::Event& event) {
   overlay_view_->button()->NotifyClick(event);
 }
 
 }  // namespace ash