Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(246)

Unified Diff: ash/system/palette/palette_tool.h

Issue 2895843002: chromeos: Eliminate WmWindow from //ash/system (Closed)
Patch Set: comments Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/palette/mock_palette_tool_delegate.h ('k') | ash/system/palette/palette_tool_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « ash/system/palette/mock_palette_tool_delegate.h ('k') | ash/system/palette/palette_tool_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698