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

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

Issue 2898743002: Draggable peeking/fullscreen launcher with transparent background. (Closed)
Patch Set: adressed 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/app_list_main_view.h
diff --git a/ui/app_list/views/app_list_main_view.h b/ui/app_list/views/app_list_main_view.h
index 937a5dd271615da87d90a0c8d0c8fc3b35fd8a24..c3fafa6ee22b127da0521c9142ffb46f8e27cfdb 100644
--- a/ui/app_list/views/app_list_main_view.h
+++ b/ui/app_list/views/app_list_main_view.h
@@ -12,6 +12,7 @@
#include "base/timer/timer.h"
#include "ui/app_list/app_list_export.h"
#include "ui/app_list/app_list_model_observer.h"
+#include "ui/app_list/views/app_list_view.h"
xiyuan 2017/05/26 18:27:31 ditto, using forward decl
newcomer 2017/05/26 23:20:21 Done.
#include "ui/app_list/views/apps_grid_view_delegate.h"
#include "ui/app_list/views/search_box_view_delegate.h"
#include "ui/app_list/views/search_result_list_view_delegate.h"
@@ -35,7 +36,8 @@ class APP_LIST_EXPORT AppListMainView : public views::View,
public SearchBoxViewDelegate,
public SearchResultListViewDelegate {
public:
- explicit AppListMainView(AppListViewDelegate* delegate);
+ explicit AppListMainView(AppListViewDelegate* delegate,
+ AppListView* app_list_view);
~AppListMainView() override;
void Init(gfx::NativeView parent,
@@ -99,6 +101,7 @@ class APP_LIST_EXPORT AppListMainView : public views::View,
// Created by AppListView. Owned by views hierarchy.
SearchBoxView* search_box_view_;
ContentsView* contents_view_; // Owned by views hierarchy.
+ AppListView* const app_list_view_; // Owned by views hierarchy.
DISALLOW_COPY_AND_ASSIGN(AppListMainView);
};

Powered by Google App Engine
This is Rietveld 408576698