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

Unified Diff: ash/common/system/chromeos/palette/common_palette_tool.h

Issue 2316183003: Move a bunch of ash-only vector icons to ash/. (Closed)
Patch Set: drop the "id". Just "icon". It's cleaner. Created 4 years, 3 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
Index: ash/common/system/chromeos/palette/common_palette_tool.h
diff --git a/ash/common/system/chromeos/palette/common_palette_tool.h b/ash/common/system/chromeos/palette/common_palette_tool.h
index 67ef66fc23c22482f24e64bf1702f2db047dcab5..2cefaffaf64b35e652d485b8c454b0cd3fa4c3a7 100644
--- a/ash/common/system/chromeos/palette/common_palette_tool.h
+++ b/ash/common/system/chromeos/palette/common_palette_tool.h
@@ -6,13 +6,17 @@
#define ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_COMMON_PALETTE_TOOL_H_
#include "ash/common/system/chromeos/palette/palette_tool.h"
-#include "ash/common/system/tray/hover_highlight_view.h"
#include "ash/common/system/tray/view_click_listener.h"
#include "base/strings/string16.h"
-#include "ui/gfx/vector_icons_public.h"
+
+namespace gfx {
+struct VectorIcon;
+}
namespace ash {
+class HoverHighlightView;
+
// A PaletteTool implementation with a standard view support.
class CommonPaletteTool : public PaletteTool, public ash::ViewClickListener {
protected:
@@ -30,7 +34,7 @@ class CommonPaletteTool : public PaletteTool, public ash::ViewClickListener {
// Returns the icon used in the palette tray on the left-most edge of the
// tool.
- virtual gfx::VectorIconId GetPaletteIconId() = 0;
+ virtual const gfx::VectorIcon& GetPaletteIcon() const = 0;
// Creates a default view implementation to be returned by CreateView.
views::View* CreateDefaultView(const base::string16& name);
« no previous file with comments | « ash/common/system/chromeos/network/tray_sms.cc ('k') | ash/common/system/chromeos/palette/common_palette_tool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698