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

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

Issue 312213005: Refactor app list ContentsView to use pointer members to find views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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/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 "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 12 matching lines...) Expand all
23 namespace app_list { 23 namespace app_list {
24 24
25 class AppsGridView; 25 class AppsGridView;
26 class ApplicationDragAndDropHost; 26 class ApplicationDragAndDropHost;
27 class AppListFolderItem; 27 class AppListFolderItem;
28 class AppListMainView; 28 class AppListMainView;
29 class AppListModel; 29 class AppListModel;
30 class AppListViewDelegate; 30 class AppListViewDelegate;
31 class AppsContainerView; 31 class AppsContainerView;
32 class PaginationModel; 32 class PaginationModel;
33 class SearchResultListView;
33 class StartPageView; 34 class StartPageView;
34 35
35 // A view to manage sub views under the search box (apps grid view + page 36 // A view to manage sub views under the search box (apps grid view + page
36 // switcher and search results). The two sets of sub views are mutually 37 // switcher and search results). The two sets of sub views are mutually
37 // exclusive. ContentsView manages a show state to choose one set to show 38 // exclusive. ContentsView manages a show state to choose one set to show
38 // and animates the transition between show states. 39 // and animates the transition between show states.
39 class APP_LIST_EXPORT ContentsView : public views::View { 40 class APP_LIST_EXPORT ContentsView : public views::View {
40 public: 41 public:
41 enum ShowState { 42 enum ShowState {
42 SHOW_APPS, 43 SHOW_APPS,
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 86
86 // Gets the PaginationModel owned by the AppsGridView. 87 // Gets the PaginationModel owned by the AppsGridView.
87 PaginationModel* GetAppsPaginationModel(); 88 PaginationModel* GetAppsPaginationModel();
88 89
89 // Overridden from ui::EventHandler: 90 // Overridden from ui::EventHandler:
90 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 91 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
91 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; 92 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
92 93
93 ShowState show_state_; 94 ShowState show_state_;
94 95
95 AppsContainerView* apps_container_view_; // Owned by the views hierarchy. 96 // Special sub views of the ContentsView. All owned by the views hierarchy.
benwells 2014/06/05 06:33:45 How are they special??
Matt Giuca 2014/06/05 06:54:11 "Special" means that we need hard-coded access to
96 StartPageView* start_page_view_; // Owned by the views hierarchy. 97 AppsContainerView* apps_container_view_;
98 SearchResultListView* search_results_view_;
99 StartPageView* start_page_view_;
97 100
98 AppListMainView* app_list_main_view_; // Parent view, owns this. 101 AppListMainView* app_list_main_view_; // Parent view, owns this.
99 102
100 scoped_ptr<views::ViewModel> view_model_; 103 scoped_ptr<views::ViewModel> view_model_;
101 scoped_ptr<views::BoundsAnimator> bounds_animator_; 104 scoped_ptr<views::BoundsAnimator> bounds_animator_;
102 105
103 DISALLOW_COPY_AND_ASSIGN(ContentsView); 106 DISALLOW_COPY_AND_ASSIGN(ContentsView);
104 }; 107 };
105 108
106 } // namespace app_list 109 } // namespace app_list
107 110
108 #endif // UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_ 111 #endif // UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | ui/app_list/views/contents_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698