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

Unified Diff: ash/common/shelf/app_list_shelf_item_delegate.cc

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/app_list_shelf_item_delegate.cc
diff --git a/ash/common/shelf/app_list_shelf_item_delegate.cc b/ash/common/shelf/app_list_shelf_item_delegate.cc
index 93b8a10e63ff734b20437f651a85634140fc6569..6fe64b72fe4d48b6cb824b5ed0bfcb8564af3b76 100644
--- a/ash/common/shelf/app_list_shelf_item_delegate.cc
+++ b/ash/common/shelf/app_list_shelf_item_delegate.cc
@@ -52,7 +52,7 @@ base::string16 AppListShelfItemDelegate::GetTitle() {
ShelfMenuModel* AppListShelfItemDelegate::CreateApplicationMenu(
int event_flags) {
// AppList does not show an application menu.
- return NULL;
+ return nullptr;
}
bool AppListShelfItemDelegate::IsDraggable() {
@@ -67,6 +67,10 @@ bool AppListShelfItemDelegate::ShouldShowTooltip() {
return true;
}
+bool AppListShelfItemDelegate::IsOpen() const {
+ return WmShell::Get()->GetAppListTargetVisibility();
+}
+
void AppListShelfItemDelegate::Close() {}
} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698