Index: ash/system/palette/palette_tool.h |
diff --git a/ash/system/palette/palette_tool.h b/ash/system/palette/palette_tool.h |
index c1f1311ea9c70820bfb2d001de82347ae41c75a4..fa1b8a82c342d86709e32c601c4a2179cbcaa0e1 100644 |
--- a/ash/system/palette/palette_tool.h |
+++ b/ash/system/palette/palette_tool.h |
@@ -15,6 +15,10 @@ |
#include "base/macros.h" |
#include "ui/gfx/vector_icon_types.h" |
+namespace aura { |
+class Window; |
+} |
+ |
namespace gfx { |
struct VectorIcon; |
} |
@@ -25,8 +29,6 @@ class View; |
namespace ash { |
-class WmWindow; |
- |
enum class PaletteGroup; |
enum class PaletteToolId; |
class PaletteToolManager; |
@@ -40,9 +42,6 @@ class ASH_EXPORT PaletteTool { |
public: |
class Delegate { |
public: |
- Delegate() {} |
- virtual ~Delegate() {} |
- |
// Enable or disable a specific tool. |
virtual void EnableTool(PaletteToolId tool_id) = 0; |
virtual void DisableTool(PaletteToolId tool_id) = 0; |
@@ -54,7 +53,7 @@ class ASH_EXPORT PaletteTool { |
virtual void HidePaletteImmediately() = 0; |
// Returns the root window. |
- virtual WmWindow* GetWindow() = 0; |
+ virtual aura::Window* GetWindow() = 0; |
// Record usage of each pen palette option. |
virtual void RecordPaletteOptionsUsage(PaletteTrayOptions option) = 0; |
@@ -62,8 +61,8 @@ class ASH_EXPORT PaletteTool { |
// Record mode cancellation of pen palette. |
virtual void RecordPaletteModeCancellation(PaletteModeCancelType type) = 0; |
- private: |
- DISALLOW_COPY_AND_ASSIGN(Delegate); |
+ protected: |
+ virtual ~Delegate() {} |
}; |
// Adds all available PaletteTool instances to the tool_manager. |