chromeos: Eliminate WmWindow from //ash/system

ash/system/palette/palette_tray.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/palette/palette_tray.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/resources/grit/ash_resources.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/wm_shelf.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/palette/palette_tool_manager.h"
 #include "ash/system/palette/palette_utils.h"
 #include "ash/system/tray/system_menu_button.h"
 #include "ash/system/tray/system_tray_controller.h"
 #include "ash/system/tray/tray_bubble_wrapper.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_container.h"
 #include "ash/system/tray/tray_popup_header_button.h"
 #include "ash/system/tray/tray_popup_item_style.h"
 #include "ash/wm_window.h"
 #include "base/metrics/histogram_macros.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/events/devices/input_device_manager.h"
 #include "ui/events/devices/stylus_state.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 
@@ skipping 25 matching lines @@
   return !session_controller->IsUserSessionBlocked() &&
          session_controller->GetSessionState() ==
              session_manager::SessionState::ACTIVE &&
          !session_controller->IsKioskSession();
 }
 
 // Returns true if the |palette_tray| is on an internal display or on every
 // display if requested from the command line.
 bool ShouldShowOnDisplay(PaletteTray* palette_tray) {
   const display::Display& display =
-      WmWindow::Get(palette_tray->GetWidget()->GetNativeWindow())
-          ->GetDisplayNearestWindow();
+      display::Screen::GetScreen()->GetDisplayNearestWindow(
+          palette_tray->GetWidget()->GetNativeWindow());
   return display.IsInternal() ||
          palette_utils::IsPaletteEnabledOnEveryDisplay();
 }
 
 class TitleView : public views::View, public views::ButtonListener {
  public:
   explicit TitleView(PaletteTray* palette_tray) : palette_tray_(palette_tray) {
     // TODO(tdanderson|jdufault): Use TriView to handle the layout of the title.
     // See crbug.com/614453.
     auto* box_layout =
@@ skipping 214 matching lines @@
 
 base::string16 PaletteTray::GetAccessibleNameForBubble() {
   return GetAccessibleNameForTray();
 }
 
 void PaletteTray::OnBeforeBubbleWidgetInit(
     views::Widget* anchor_widget,
     views::Widget* bubble_widget,
     views::Widget::InitParams* params) const {
   // Place the bubble in the same root window as |anchor_widget|.
-  WmWindow::Get(anchor_widget->GetNativeWindow())
-      ->GetRootWindowController()
+  RootWindowController::ForWindow(anchor_widget->GetNativeWindow())

[msw, 2017/05/22 18:37:11]

aside: We should consolidate that with ash::GetRootWindowController().

[James Cook, 2017/05/22 21:04:54]

Yeah. I think we should eliminate ash::GetRootWindowController() - I don't like
bare functions in large namespaces like ash.

       ->ConfigureWidgetInitParamsForContainer(
           bubble_widget, kShellWindowId_SettingBubbleContainer, params);
 }
 
 void PaletteTray::HideBubble(const views::TrayBubbleView* bubble_view) {
   HideBubbleWithView(bubble_view);
 }
 
 void PaletteTray::HidePalette() {
   is_bubble_auto_opened_ = false;
@@ skipping 28 matching lines @@
   UMA_HISTOGRAM_ENUMERATION(
       "Ash.Shelf.Palette.ModeCancellation", type,
       PaletteModeCancelType::PALETTE_MODE_CANCEL_TYPE_COUNT);
 }
 
 void PaletteTray::OnActiveToolChanged() {
   ++num_actions_in_bubble_;
   UpdateTrayIcon();
 }
 
-WmWindow* PaletteTray::GetWindow() {
-  return shelf()->GetWindow();
+aura::Window* PaletteTray::GetWindow() {
+  return WmWindow::GetAuraWindow(shelf()->GetWindow());

[msw, 2017/05/22 18:37:11]

ditto optional nit: ->aura_window()

[James Cook, 2017/05/22 21:04:54]

Done.

 }
 
 void PaletteTray::AnchorUpdated() {
   if (bubble_)
     bubble_->bubble_view()->UpdateBubble();
 }
 
 void PaletteTray::Initialize() {
   PaletteDelegate* delegate = Shell::Get()->palette_delegate();
   // |delegate| can be null in tests.
@@ skipping 23 matching lines @@
     UpdateIconVisibility();
   }
 }
 
 void PaletteTray::UpdateIconVisibility() {
   SetVisible(is_palette_enabled_ && palette_utils::HasStylusInput() &&
              ShouldShowOnDisplay(this) && IsInUserSession());
 }
 
 }  // namespace ash