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

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

Issue 2288993002: ash: Move AppList support to ShelfWidget, expose ShelfWidget in WmShelf (Closed)
Patch Set: missed one unit test Created 4 years, 4 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/common/shelf/shelf.cc ('k') | ash/common/shelf/shelf_widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/shelf_widget.h
diff --git a/ash/common/shelf/shelf_widget.h b/ash/common/shelf/shelf_widget.h
index ac43c023ea1b8ea464e2fc67b2f4f134e37e3e40..e2e5c8c9e3ed40e68b33b5b5d080034774cd0953 100644
--- a/ash/common/shelf/shelf_widget.h
+++ b/ash/common/shelf/shelf_widget.h
@@ -16,7 +16,12 @@
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_observer.h"
+namespace app_list {
+class ApplicationDragAndDropHost;
+}
+
namespace ash {
+class AppListButton;
class FocusCycler;
class Shelf;
class ShelfLayoutManager;
@@ -96,6 +101,12 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
// See WmShelf::GetScreenBoundsOfItemIconForWindow().
gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window);
+ // Returns the button that opens the app launcher.
+ AppListButton* GetAppListButton() const;
+
+ // Returns the ApplicationDragAndDropHost for this shelf.
+ app_list::ApplicationDragAndDropHost* GetDragAndDropHostForAppList();
+
// Overridden from views::WidgetObserver:
void OnWidgetActivationChanged(views::Widget* widget, bool active) override;
« no previous file with comments | « ash/common/shelf/shelf.cc ('k') | ash/common/shelf/shelf_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698