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

Side by Side Diff: ui/app_list/views/app_list_folder_view.h

Issue 265723003: Fix app list drag view being hidden on reparent when synchronous drag is setting up. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@app_list_win_stuck_icons_real
Patch Set: address comments Created 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_APP_LIST_VIEWS_APP_LIST_FOLDER_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_APP_LIST_FOLDER_VIEW_H_
6 #define UI_APP_LIST_VIEWS_APP_LIST_FOLDER_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_APP_LIST_FOLDER_VIEW_H_
7 7
8 #include "ui/app_list/app_list_item_list_observer.h" 8 #include "ui/app_list/app_list_item_list_observer.h"
9 #include "ui/app_list/views/apps_grid_view.h" 9 #include "ui/app_list/views/apps_grid_view.h"
10 #include "ui/app_list/views/apps_grid_view_folder_delegate.h" 10 #include "ui/app_list/views/apps_grid_view_folder_delegate.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 virtual void ReparentItem(AppListItemView* original_drag_view, 97 virtual void ReparentItem(AppListItemView* original_drag_view,
98 const gfx::Point& drag_point_in_folder_grid) 98 const gfx::Point& drag_point_in_folder_grid)
99 OVERRIDE; 99 OVERRIDE;
100 virtual void DispatchDragEventForReparent( 100 virtual void DispatchDragEventForReparent(
101 AppsGridView::Pointer pointer, 101 AppsGridView::Pointer pointer,
102 const gfx::Point& drag_point_in_folder_grid) OVERRIDE; 102 const gfx::Point& drag_point_in_folder_grid) OVERRIDE;
103 virtual void DispatchEndDragEventForReparent( 103 virtual void DispatchEndDragEventForReparent(
104 bool events_forwarded_to_drag_drop_host) OVERRIDE; 104 bool events_forwarded_to_drag_drop_host) OVERRIDE;
105 virtual bool IsPointOutsideOfFolderBoundary(const gfx::Point& point) OVERRIDE; 105 virtual bool IsPointOutsideOfFolderBoundary(const gfx::Point& point) OVERRIDE;
106 virtual bool IsOEMFolder() const OVERRIDE; 106 virtual bool IsOEMFolder() const OVERRIDE;
107 virtual void SetRootLevelDragViewVisible(bool visible) OVERRIDE;
107 108
108 AppsContainerView* container_view_; // Not owned. 109 AppsContainerView* container_view_; // Not owned.
109 AppListMainView* app_list_main_view_; // Not Owned. 110 AppListMainView* app_list_main_view_; // Not Owned.
110 FolderHeaderView* folder_header_view_; // Owned by views hierarchy. 111 FolderHeaderView* folder_header_view_; // Owned by views hierarchy.
111 AppsGridView* items_grid_view_; // Owned by the views hierarchy. 112 AppsGridView* items_grid_view_; // Owned by the views hierarchy.
112 113
113 scoped_ptr<views::ViewModel> view_model_; 114 scoped_ptr<views::ViewModel> view_model_;
114 115
115 AppListModel* model_; // Not owned. 116 AppListModel* model_; // Not owned.
116 AppListFolderItem* folder_item_; // Not owned. 117 AppListFolderItem* folder_item_; // Not owned.
117 118
118 scoped_ptr<PaginationModel> pagination_model_; 119 scoped_ptr<PaginationModel> pagination_model_;
119 120
120 bool hide_for_reparent_; 121 bool hide_for_reparent_;
121 122
122 base::string16 accessible_name_; 123 base::string16 accessible_name_;
123 124
124 DISALLOW_COPY_AND_ASSIGN(AppListFolderView); 125 DISALLOW_COPY_AND_ASSIGN(AppListFolderView);
125 }; 126 };
126 127
127 } // namespace app_list 128 } // namespace app_list
128 129
129 #endif // UI_APP_LIST_VIEWS_APP_LIST_FOLDER_VIEW_H_ 130 #endif // UI_APP_LIST_VIEWS_APP_LIST_FOLDER_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | ui/app_list/views/app_list_folder_view.cc » ('j') | ui/app_list/views/apps_grid_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698