ui/app_list/views/app_list_folder_view.h - Issue 598013003: Added views::ViewModelT<T>, a type-safe template version of ViewModel.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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, 3 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 side-by-side diff with in-line comments

Download patch

Index: ui/app_list/views/app_list_folder_view.h

diff --git a/ui/app_list/views/app_list_folder_view.h b/ui/app_list/views/app_list_folder_view.h

index 25485382bb38de20366c7a64e2bba11d244583c9..75a19f6195fb1aac968d8f6fceea4cb762c096ae 100644

--- a/ui/app_list/views/app_list_folder_view.h

+++ b/ui/app_list/views/app_list_folder_view.h

@@ -15,10 +15,7 @@

#include "ui/compositor/layer_animation_observer.h"

#include "ui/views/controls/button/button.h"

#include "ui/views/view.h"

-namespace views {

-class ViewModel;

+#include "ui/views/view_model.h"

namespace app_list {

@@ -113,7 +110,7 @@ class AppListFolderView : public views::View,

FolderHeaderView* folder_header_view_; // Owned by views hierarchy.

AppsGridView* items_grid_view_; // Owned by the views hierarchy.

- scoped_ptr<views::ViewModel> view_model_;

+ scoped_ptr<views::ViewModel<views::View>> view_model_;

AppListModel* model_; // Not owned.

AppListFolderItem* folder_item_; // Not owned.

« no previous file with comments | « chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc ('k') | ui/app_list/views/app_list_folder_view.cc » ('j') | ui/views/view_model.h » ('J')