Index: ash/shelf/shelf_item_delegate.h |
diff --git a/ash/launcher/launcher_item_delegate.h b/ash/shelf/shelf_item_delegate.h |
similarity index 86% |
rename from ash/launcher/launcher_item_delegate.h |
rename to ash/shelf/shelf_item_delegate.h |
index c83de47b814e9b17aa3735afcafc726e0a30e3d3..129325bfcd2cbcc412be21f48357889302e8bf83 100644 |
--- a/ash/launcher/launcher_item_delegate.h |
+++ b/ash/shelf/shelf_item_delegate.h |
@@ -2,18 +2,13 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef ASH_LAUNCHER_LAUNCHER_ITEM_DELEGATE_H_ |
-#define ASH_LAUNCHER_LAUNCHER_ITEM_DELEGATE_H_ |
+#ifndef ASH_SHELF_SHELF_ITEM_DELEGATE_H_ |
+#define ASH_SHELF_SHELF_ITEM_DELEGATE_H_ |
#include "ash/ash_export.h" |
-#include "ash/launcher/launcher_types.h" |
#include "base/strings/string16.h" |
#include "ui/base/models/simple_menu_model.h" |
-namespace aura { |
-class RootWindow; |
-} |
- |
namespace ui { |
class Event; |
} |
@@ -35,9 +30,9 @@ class ASH_EXPORT LauncherMenuModel : public ui::SimpleMenuModel { |
}; |
// Delegate for the LauncherItem. |
-class ASH_EXPORT LauncherItemDelegate { |
+class ASH_EXPORT ShelfItemDelegate { |
public: |
- virtual ~LauncherItemDelegate() {} |
+ virtual ~ShelfItemDelegate() {} |
// Invoked when the user clicks on a window entry in the launcher. |
// |event| is the click event. The |event| is dispatched by a view |
@@ -65,7 +60,7 @@ class ASH_EXPORT LauncherItemDelegate { |
// - A list containing the title and the active list of items. |
// The caller takes ownership of the returned model. |
// |event_flags| specifies the flags of the event which triggered this menu. |
- virtual ash::LauncherMenuModel* CreateApplicationMenu(int event_flags) = 0; |
+ virtual LauncherMenuModel* CreateApplicationMenu(int event_flags) = 0; |
// Whether the launcher item is draggable. |
virtual bool IsDraggable() = 0; |
@@ -76,4 +71,4 @@ class ASH_EXPORT LauncherItemDelegate { |
} // namespace ash |
-#endif // ASH_LAUNCHER_LAUNCHER_ITEM_DELEGATE_H_ |
+#endif // ASH_SHELF_SHELF_ITEM_DELEGATE_H_ |