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

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

Issue 163953008: Remove the animation delay for showing the top level apps when user opens app list launcher. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move show/hide and animation logic for the views from Layout to SetShowState. Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ui/app_list/views/app_list_folder_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/folder_header_view.h" 10 #include "ui/app_list/views/folder_header_view.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 // for re-parenting a folder item. 74 // for re-parenting a folder item.
75 void DispatchDragEventForReparent(AppsGridView::Pointer pointer, 75 void DispatchDragEventForReparent(AppsGridView::Pointer pointer,
76 const ui::LocatedEvent& event); 76 const ui::LocatedEvent& event);
77 77
78 // Dispatches EndDrag event from the hidden grid view to the root level grid 78 // Dispatches EndDrag event from the hidden grid view to the root level grid
79 // view for reparenting a folder item. 79 // view for reparenting a folder item.
80 // |events_forwarded_to_drag_drop_host|: True if the dragged item is dropped 80 // |events_forwarded_to_drag_drop_host|: True if the dragged item is dropped
81 // to the drag_drop_host, eg. dropped on shelf. 81 // to the drag_drop_host, eg. dropped on shelf.
82 void DispatchEndDragEventForReparent(bool events_forwarded_to_drag_drop_host); 82 void DispatchEndDragEventForReparent(bool events_forwarded_to_drag_drop_host);
83 83
84 // Hides the view immediately without animation.
85 void HideViewImmediately();
86
84 // views::View overrides: 87 // views::View overrides:
85 virtual gfx::Size GetPreferredSize() OVERRIDE; 88 virtual gfx::Size GetPreferredSize() OVERRIDE;
86 virtual void Layout() OVERRIDE; 89 virtual void Layout() OVERRIDE;
87 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; 90 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
88 91
89 // Overridden from AppListItemListObserver: 92 // Overridden from AppListItemListObserver:
90 virtual void OnListItemRemoved(size_t index, AppListItem* item) OVERRIDE; 93 virtual void OnListItemRemoved(size_t index, AppListItem* item) OVERRIDE;
91 94
92 // ui::ImplicitAnimationObserver overrides: 95 // ui::ImplicitAnimationObserver overrides:
93 virtual void OnImplicitAnimationsCompleted() OVERRIDE; 96 virtual void OnImplicitAnimationsCompleted() OVERRIDE;
94 97
95 AppsGridView* items_grid_view() { return items_grid_view_; } 98 AppsGridView* items_grid_view() { return items_grid_view_; }
96 bool hide_for_reparent() const { return hide_for_reparent_; }
97 99
98 private: 100 private:
99 void CalculateIdealBounds(); 101 void CalculateIdealBounds();
100 102
101 // Starts setting up drag in root level apps grid view for re-parenting a 103 // Starts setting up drag in root level apps grid view for re-parenting a
102 // folder item. 104 // folder item.
103 // |drag_point_in_root_grid| is in the cooridnates of root level AppsGridView. 105 // |drag_point_in_root_grid| is in the cooridnates of root level AppsGridView.
104 void StartSetupDragInRootLevelAppsGridView( 106 void StartSetupDragInRootLevelAppsGridView(
105 AppListItemView* original_drag_view, 107 AppListItemView* original_drag_view,
106 const gfx::Point& drag_point_in_root_grid); 108 const gfx::Point& drag_point_in_root_grid);
(...skipping 14 matching lines...) Expand all
121 scoped_ptr<PaginationModel> pagination_model_; 123 scoped_ptr<PaginationModel> pagination_model_;
122 124
123 bool hide_for_reparent_; 125 bool hide_for_reparent_;
124 126
125 DISALLOW_COPY_AND_ASSIGN(AppListFolderView); 127 DISALLOW_COPY_AND_ASSIGN(AppListFolderView);
126 }; 128 };
127 129
128 } // namespace app_list 130 } // namespace app_list
129 131
130 #endif // UI_APP_LIST_VIEWS_APP_LIST_FOLDER_VIEW_H_ 132 #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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698