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

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

Issue 14533006: Drag and drop between app list and launcher - First patch (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 131481c9f25d6abec09c9252cfc8d7daa59017eb..deaa9f2efc37b443ec914fd966ce42501b3f37c1 100644
--- a/ui/app_list/views/contents_view.h
+++ b/ui/app_list/views/contents_view.h
@@ -17,6 +17,8 @@ class ViewModel;
namespace app_list {
+class AppsGridView;
+class ApplicationDnDHost;
class AppListMainView;
class AppListModel;
class PaginationModel;
@@ -33,6 +35,10 @@ class ContentsView : public views::View {
void SetModel(AppListModel* model);
+ // If |dnd_host| is not NULL it will be called upon drag and drop operations
+ // outside the application list.
+ void SetAppListDnDHost(app_list::ApplicationDnDHost* dnd_host);
+
void ShowSearchResults(bool show);
void Prerender();
@@ -65,6 +71,8 @@ class ContentsView : public views::View {
ShowState show_state_;
PaginationModel* pagination_model_; // Owned by AppListController.
+ AppsGridView* apps_grid_view_; // Owned by the view.
+
scoped_ptr<views::ViewModel> view_model_;
scoped_ptr<views::BoundsAnimator> bounds_animator_;

Powered by Google App Engine
This is Rietveld 408576698