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

Unified Diff: ash/common/shelf/shelf_window_watcher_item_delegate.h

Issue 2462753002: Use Ash's ShelfWindowWatcher for app panel windows. (Closed)
Patch Set: Add ShelfWindowWatcherTest, remove ChromeLauncherControllerImplTest panel use. Created 4 years, 1 month 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/shelf/shelf_window_watcher_item_delegate.h
diff --git a/ash/common/shelf/shelf_window_watcher_item_delegate.h b/ash/common/shelf/shelf_window_watcher_item_delegate.h
index 895e56a7fe36e446836bfbd15ad18d3782746b1c..86ac58519025e46e75f6afed0e51923240401305 100644
--- a/ash/common/shelf/shelf_window_watcher_item_delegate.h
+++ b/ash/common/shelf/shelf_window_watcher_item_delegate.h
@@ -6,6 +6,7 @@
#define ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_
#include "ash/common/shelf/shelf_item_delegate.h"
+#include "ash/common/shelf/shelf_item_types.h"
#include "base/macros.h"
namespace ash {
@@ -15,7 +16,7 @@ class WmWindow;
// ShelfItemDelegate for the items created by ShelfWindowWatcher.
class ShelfWindowWatcherItemDelegate : public ShelfItemDelegate {
public:
- explicit ShelfWindowWatcherItemDelegate(WmWindow* window);
+ ShelfWindowWatcherItemDelegate(ShelfID id, WmWindow* window);
~ShelfWindowWatcherItemDelegate() override;
private:
@@ -27,8 +28,10 @@ class ShelfWindowWatcherItemDelegate : public ShelfItemDelegate {
bool IsDraggable() override;
bool CanPin() const override;
bool ShouldShowTooltip() override;
+ bool IsOpen() const override;
void Close() override;
+ ShelfID id_;
// The window associated with this item. Not owned.
WmWindow* window_;

Powered by Google App Engine
This is Rietveld 408576698