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

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

Issue 2951903004: Added back button when in folder view. (Closed)
Patch Set: Addressed comments and cached the feature flag. Created 3 years, 5 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/contents_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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_CONTENTS_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
6 #define UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <utility> 10 #include <utility>
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 197
198 // Maps State onto |view_model_| indices. 198 // Maps State onto |view_model_| indices.
199 std::map<AppListModel::State, int> state_to_view_; 199 std::map<AppListModel::State, int> state_to_view_;
200 200
201 // Maps |view_model_| indices onto State. 201 // Maps |view_model_| indices onto State.
202 std::map<int, AppListModel::State> view_to_state_; 202 std::map<int, AppListModel::State> view_to_state_;
203 203
204 // The page that was showing before ShowSearchResults(true) was invoked. 204 // The page that was showing before ShowSearchResults(true) was invoked.
205 int page_before_search_; 205 int page_before_search_;
206 206
207 // Whether the fullscreen app list feature is active.
208 const bool is_fullscreen_app_list_enabled_;
209
207 // Manages the pagination for the launcher pages. 210 // Manages the pagination for the launcher pages.
208 PaginationModel pagination_model_; 211 PaginationModel pagination_model_;
209 212
210 DISALLOW_COPY_AND_ASSIGN(ContentsView); 213 DISALLOW_COPY_AND_ASSIGN(ContentsView);
211 }; 214 };
212 215
213 } // namespace app_list 216 } // namespace app_list
214 217
215 #endif // UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_ 218 #endif // UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/views/app_list_view.cc ('k') | ui/app_list/views/contents_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698