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

Unified Diff: ui/app_list/views/contents_view.h

Issue 2898743002: Draggable peeking/fullscreen launcher with transparent background. (Closed)
Patch Set: Migrated from wm_shelf to shelf and addressed comments! Created 3 years, 7 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
Index: ui/app_list/views/contents_view.h
diff --git a/ui/app_list/views/contents_view.h b/ui/app_list/views/contents_view.h
index e620a251e4fa7d0fae58ad955f222def601954e9..c1a654414f385e78be6aa7067d28b2a1c8847b61 100644
--- a/ui/app_list/views/contents_view.h
+++ b/ui/app_list/views/contents_view.h
@@ -16,6 +16,7 @@
#include "ui/app_list/app_list_model_observer.h"
#include "ui/app_list/pagination_model.h"
#include "ui/app_list/pagination_model_observer.h"
+#include "ui/app_list/views/app_list_view.h"
#include "ui/views/view.h"
#include "ui/views/view_model.h"
@@ -46,7 +47,8 @@ class APP_LIST_EXPORT ContentsView : public views::View,
public PaginationModelObserver,
public AppListModelObserver {
public:
- explicit ContentsView(AppListMainView* app_list_main_view);
+ explicit ContentsView(AppListMainView* app_list_main_view,
+ AppListView* app_list_view);
~ContentsView() override;
// Initialize the pages of the launcher. Should be called after
@@ -200,6 +202,8 @@ class APP_LIST_EXPORT ContentsView : public views::View,
// Parent view. Owned by the views hierarchy.
AppListMainView* app_list_main_view_;
+ AppListView* app_list_view_; // Owned by the views hierarchy.
vadimt 2017/05/26 01:27:57 const Comment in a separate line.
newcomer 2017/05/26 17:11:28 Done.
+
// Maps State onto |view_model_| indices.
std::map<AppListModel::State, int> state_to_view_;

Powered by Google App Engine
This is Rietveld 408576698