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

Unified Diff: ash/shelf/shelf_window_watcher_item_delegate.h

Issue 107163005: [ash] Add TYPE_DIALOG and its item's LauncherContextMenu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 11 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/shelf/shelf_window_watcher.cc ('k') | ash/shelf/shelf_window_watcher_item_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_window_watcher_item_delegate.h
diff --git a/ash/shelf/shelf_window_watcher_item_delegate.h b/ash/shelf/shelf_window_watcher_item_delegate.h
index 24723114e5ee3a53ae9add72bc3c8794191d22cd..7a40f638c5b63db9e4e733ea5dcc33bd06031353 100644
--- a/ash/shelf/shelf_window_watcher_item_delegate.h
+++ b/ash/shelf/shelf_window_watcher_item_delegate.h
@@ -14,18 +14,18 @@ class Window;
}
namespace ash {
+
+class ShelfModel;
+
namespace internal {
// ShelfItemDelegate for the items created by ShelfWindowWatcher.
class ShelfWindowWatcherItemDelegate : public ShelfItemDelegate {
public:
- explicit ShelfWindowWatcherItemDelegate(aura::Window* window);
+ ShelfWindowWatcherItemDelegate(aura::Window* window, ShelfModel* model_);
virtual ~ShelfWindowWatcherItemDelegate();
- // Closes the window associated with this item.
- void Close();
-
private:
// ShelfItemDelegate overrides:
virtual bool ItemSelected(const ui::Event& event) OVERRIDE;
@@ -34,10 +34,14 @@ class ShelfWindowWatcherItemDelegate : public ShelfItemDelegate {
virtual ShelfMenuModel* CreateApplicationMenu(int event_flags) OVERRIDE;
virtual bool IsDraggable() OVERRIDE;
virtual bool ShouldShowTooltip() OVERRIDE;
+ virtual void Close() OVERRIDE;
// Stores a Window associated with this item. Not owned.
aura::Window* window_;
+ // Not owned.
+ ShelfModel* model_;
+
DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcherItemDelegate);
};
« no previous file with comments | « ash/shelf/shelf_window_watcher.cc ('k') | ash/shelf/shelf_window_watcher_item_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698