[mus+ash] Removes WmWindow from ash/shelf and ash/shell

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.h"
 #include "ash/shelf/shelf_constants.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"
@@ skipping 316 matching lines @@
       "Ash.Shelf.Palette.ModeCancellation", type,
       PaletteModeCancelType::PALETTE_MODE_CANCEL_TYPE_COUNT);
 }
 
 void PaletteTray::OnActiveToolChanged() {
   ++num_actions_in_bubble_;
   UpdateTrayIcon();
 }
 
 aura::Window* PaletteTray::GetWindow() {
-  return shelf()->GetWindow()->aura_window();
+  return shelf()->GetWindow();
 }
 
 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