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

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

Issue 298963004: app_list: Fix possible out of bounds index. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: DCHECK -> CHECK 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/app_list/views/app_list_main_view_unittest.cc ('k') | ui/app_list/views/apps_grid_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/apps_grid_view.h
diff --git a/ui/app_list/views/apps_grid_view.h b/ui/app_list/views/apps_grid_view.h
index 79d19e65094118f2ee372123f94ac290bedc6e1b..c6c9efa6f800626ace779214e5aa5590cacb5a5d 100644
--- a/ui/app_list/views/apps_grid_view.h
+++ b/ui/app_list/views/apps_grid_view.h
@@ -403,9 +403,9 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
// Gets the bounds of the tile located at |row| and |col| on current page.
gfx::Rect GetTileBounds(int row, int col) const;
- // Returns true if the slot of |index| is the first empty slot next to the
- // last item on the last page.
- bool IsFirstEmptySlot(const Index& index) const;
+ // Returns true if the slot of |index| is the last possible slot to drop
+ // an item, i.e. first empty slot next to the last item on the last page.
+ bool IsLastPossibleDropTarget(const Index& index) const;
// Gets the item view located at |slot| on the current page. If there is
// no item located at |slot|, returns NULL.
@@ -497,6 +497,9 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
// Created when a drag is started (ie: drag exceeds the drag threshold), but
// not Run() until supplied with a shortcut path.
scoped_refptr<SynchronousDrag> synchronous_drag_;
+
+ // Whether to use SynchronousDrag to support dropping to task bar etc.
+ bool use_synchronous_drag_;
#endif
Pointer drag_pointer_;
« no previous file with comments | « ui/app_list/views/app_list_main_view_unittest.cc ('k') | ui/app_list/views/apps_grid_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698