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

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

Issue 214423002: Reset the app list when it is shown on Windows and Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix_app_list_folder_drag_for_real
Patch Set: fix nits Created 6 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 unified diff | Download patch
« no previous file with comments | « ui/app_list/views/app_list_view.cc ('k') | ui/app_list/views/apps_container_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_APPS_CONTAINER_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_APPS_CONTAINER_VIEW_H_
6 #define UI_APP_LIST_VIEWS_APPS_CONTAINER_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_APPS_CONTAINER_VIEW_H_
7 7
8 #include "ui/app_list/app_list_folder_item.h" 8 #include "ui/app_list/app_list_folder_item.h"
9 #include "ui/app_list/views/top_icon_animation_view.h" 9 #include "ui/app_list/views/top_icon_animation_view.h"
10 #include "ui/views/view.h" 10 #include "ui/views/view.h"
(...skipping 25 matching lines...) Expand all
36 AppListModel* model); 36 AppListModel* model);
37 virtual ~AppsContainerView(); 37 virtual ~AppsContainerView();
38 38
39 // Shows the active folder content specified by |folder_item|. 39 // Shows the active folder content specified by |folder_item|.
40 void ShowActiveFolder(AppListFolderItem* folder_item); 40 void ShowActiveFolder(AppListFolderItem* folder_item);
41 41
42 // Shows the root level apps list. This is called when UI navigate back from 42 // Shows the root level apps list. This is called when UI navigate back from
43 // a folder view with |folder_item|. If |folder_item| is NULL skips animation. 43 // a folder view with |folder_item|. If |folder_item| is NULL skips animation.
44 void ShowApps(AppListFolderItem* folder_item); 44 void ShowApps(AppListFolderItem* folder_item);
45 45
46 // Resets the app list to a state where it shows the main grid view. This is
47 // called when the user opens the launcher for the first time or when the user
48 // hides and then shows it. This is necessary because we only hide and show
49 // the launcher on Windows and Linux so we need to reset to a fresh state.
50 void ResetForShowApps();
51
46 // Sets |drag_and_drop_host_| for the current app list in both 52 // Sets |drag_and_drop_host_| for the current app list in both
47 // app_list_folder_view_ and root level apps_grid_view_. 53 // app_list_folder_view_ and root level apps_grid_view_.
48 void SetDragAndDropHostOfCurrentAppList( 54 void SetDragAndDropHostOfCurrentAppList(
49 ApplicationDragAndDropHost* drag_and_drop_host); 55 ApplicationDragAndDropHost* drag_and_drop_host);
50 56
51 // Transits the UI from folder view to root lelve apps grid view when 57 // Transits the UI from folder view to root lelve apps grid view when
52 // re-parenting a child item of |folder_item|. 58 // re-parenting a child item of |folder_item|.
53 void ReparentFolderItemTransit(AppListFolderItem* folder_item); 59 void ReparentFolderItemTransit(AppListFolderItem* folder_item);
54 60
55 // views::View overrides: 61 // views::View overrides:
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 106
101 size_t top_icon_animation_pending_count_; 107 size_t top_icon_animation_pending_count_;
102 108
103 DISALLOW_COPY_AND_ASSIGN(AppsContainerView); 109 DISALLOW_COPY_AND_ASSIGN(AppsContainerView);
104 }; 110 };
105 111
106 } // namespace app_list 112 } // namespace app_list
107 113
108 114
109 #endif // UI_APP_LIST_VIEWS_APPS_CONTAINER_VIEW_H_ 115 #endif // UI_APP_LIST_VIEWS_APPS_CONTAINER_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/views/app_list_view.cc ('k') | ui/app_list/views/apps_container_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698