chromeos: Eliminate WmWindow from //ash/system

ash/system/palette/palette_tool_manager.h

 // 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.
 
 #ifndef ASH_SYSTEM_PALETTE_PALETTE_TOOL_MANAGER_H_
 #define ASH_SYSTEM_PALETTE_PALETTE_TOOL_MANAGER_H_
 
 #include <map>
 #include <memory>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/system/palette/palette_ids.h"
 #include "ash/system/palette/palette_tool.h"
 #include "base/callback.h"
 #include "base/macros.h"
 
+namespace aura {
+class Window;
+}
+
 namespace views {
 class View;
 }
 
 namespace ash {
 
 class PaletteTool;
 enum class PaletteGroup;
 enum class PaletteToolId;
-class WmWindow;
 
 struct ASH_EXPORT PaletteToolView {
   PaletteGroup group;
   PaletteToolId tool_id;
   views::View* view;
 };
 
 class ASH_EXPORT PaletteToolManager : public PaletteTool::Delegate {
  public:
   class Delegate {

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

aside: Sigh, this PaletteTool::Delegate subclass has a largely redundant
delegate interface declaration...

    public:
-    Delegate() {}
-    virtual ~Delegate() {}
-
     // Hide the palette (if shown).
     virtual void HidePalette() = 0;
 
     // Hide the palette immediately, ie, do not display a hide animation.
     virtual void HidePaletteImmediately() = 0;
 
     // Called when the active tool has changed.
     virtual void OnActiveToolChanged() = 0;
 
     // Return the window associated with this palette.
-    virtual WmWindow* GetWindow() = 0;
+    virtual aura::Window* GetWindow() = 0;
 
     // Record usage of each pen palette option.
-    virtual void RecordPaletteOptionsUsage(ash::PaletteTrayOptions option) = 0;
+    virtual void RecordPaletteOptionsUsage(PaletteTrayOptions option) = 0;
 
     // Record mode cancellation of pen palette.
     virtual void RecordPaletteModeCancellation(PaletteModeCancelType type) = 0;
 
-   private:
-    DISALLOW_COPY_AND_ASSIGN(Delegate);
+   protected:
+    virtual ~Delegate() {}
   };
 
   // Creates the tool manager.
   PaletteToolManager(Delegate* delegate);
   ~PaletteToolManager() override;
 
   // Adds the given |tool| to the tool manager. The tool is assumed to be in a
   // deactivated state. This class takes ownership over |tool|.
   void AddTool(std::unique_ptr<PaletteTool> tool);
 
@@ skipping 23 matching lines @@
 
   // Helper method to disable any active tool in the given |group|.
   void DisableActiveTool(PaletteGroup group);
 
  private:
   // PaleteTool::Delegate overrides.
   void EnableTool(PaletteToolId tool_id) override;
   void DisableTool(PaletteToolId tool_id) override;
   void HidePalette() override;
   void HidePaletteImmediately() override;
-  WmWindow* GetWindow() override;
+  aura::Window* GetWindow() override;
   void RecordPaletteOptionsUsage(ash::PaletteTrayOptions option) override;
   void RecordPaletteModeCancellation(PaletteModeCancelType type) override;
 
   PaletteTool* FindToolById(PaletteToolId tool_id) const;
 
   // Unowned pointer to the delegate to provide external functionality.
   Delegate* delegate_;
 
   // Unowned pointer to the active tool / group.
   std::map<PaletteGroup, PaletteTool*> active_tools_;
 
   // Owned list of all tools.
   std::vector<std::unique_ptr<PaletteTool>> tools_;
 
   DISALLOW_COPY_AND_ASSIGN(PaletteToolManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_PALETTE_PALETTE_TOOL_MANAGER_H_