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

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

Issue 598013003: Added views::ViewModelT<T>, a type-safe template version of ViewModel. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@appsgridview-static-casts
Patch Set: DISALLOW_COPY_AND_ASSIGN. Created 6 years, 2 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
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 <string> 8 #include <string>
9 9
10 #include "ui/app_list/app_list_item_list_observer.h" 10 #include "ui/app_list/app_list_item_list_observer.h"
11 #include "ui/app_list/views/apps_grid_view.h" 11 #include "ui/app_list/views/apps_grid_view.h"
12 #include "ui/app_list/views/apps_grid_view_folder_delegate.h" 12 #include "ui/app_list/views/apps_grid_view_folder_delegate.h"
13 #include "ui/app_list/views/folder_header_view.h" 13 #include "ui/app_list/views/folder_header_view.h"
14 #include "ui/app_list/views/folder_header_view_delegate.h" 14 #include "ui/app_list/views/folder_header_view_delegate.h"
15 #include "ui/compositor/layer_animation_observer.h" 15 #include "ui/compositor/layer_animation_observer.h"
16 #include "ui/views/controls/button/button.h" 16 #include "ui/views/controls/button/button.h"
17 #include "ui/views/view.h" 17 #include "ui/views/view.h"
18 18 #include "ui/views/view_model.h"
19 namespace views {
20 class ViewModel;
21 }
22 19
23 namespace app_list { 20 namespace app_list {
24 21
25 class AppsContainerView; 22 class AppsContainerView;
26 class AppsGridView; 23 class AppsGridView;
27 class AppListFolderItem; 24 class AppListFolderItem;
28 class AppListItemView; 25 class AppListItemView;
29 class AppListMainView; 26 class AppListMainView;
30 class AppListModel; 27 class AppListModel;
31 class FolderHeaderView; 28 class FolderHeaderView;
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 bool cancel_drag) OVERRIDE; 103 bool cancel_drag) OVERRIDE;
107 virtual bool IsPointOutsideOfFolderBoundary(const gfx::Point& point) OVERRIDE; 104 virtual bool IsPointOutsideOfFolderBoundary(const gfx::Point& point) OVERRIDE;
108 virtual bool IsOEMFolder() const OVERRIDE; 105 virtual bool IsOEMFolder() const OVERRIDE;
109 virtual void SetRootLevelDragViewVisible(bool visible) OVERRIDE; 106 virtual void SetRootLevelDragViewVisible(bool visible) OVERRIDE;
110 107
111 AppsContainerView* container_view_; // Not owned. 108 AppsContainerView* container_view_; // Not owned.
112 AppListMainView* app_list_main_view_; // Not Owned. 109 AppListMainView* app_list_main_view_; // Not Owned.
113 FolderHeaderView* folder_header_view_; // Owned by views hierarchy. 110 FolderHeaderView* folder_header_view_; // Owned by views hierarchy.
114 AppsGridView* items_grid_view_; // Owned by the views hierarchy. 111 AppsGridView* items_grid_view_; // Owned by the views hierarchy.
115 112
116 scoped_ptr<views::ViewModel> view_model_; 113 scoped_ptr<views::ViewModel<views::View>> view_model_;
117 114
118 AppListModel* model_; // Not owned. 115 AppListModel* model_; // Not owned.
119 AppListFolderItem* folder_item_; // Not owned. 116 AppListFolderItem* folder_item_; // Not owned.
120 117
121 bool hide_for_reparent_; 118 bool hide_for_reparent_;
122 119
123 base::string16 accessible_name_; 120 base::string16 accessible_name_;
124 121
125 DISALLOW_COPY_AND_ASSIGN(AppListFolderView); 122 DISALLOW_COPY_AND_ASSIGN(AppListFolderView);
126 }; 123 };
127 124
128 } // namespace app_list 125 } // namespace app_list
129 126
130 #endif // UI_APP_LIST_VIEWS_APP_LIST_FOLDER_VIEW_H_ 127 #endif // UI_APP_LIST_VIEWS_APP_LIST_FOLDER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698