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

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

Issue 22354002: Remove SetModel in ContentsView and SearchBoxView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove AppListModel stuff from SearchBoxView Created 7 years, 4 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_main_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 "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 class AppListModel; 23 class AppListModel;
24 class PaginationModel; 24 class PaginationModel;
25 25
26 // A view to manage sub views under the search box (apps grid view + page 26 // A view to manage sub views under the search box (apps grid view + page
27 // switcher and search results). The two sets of sub views are mutually 27 // switcher and search results). The two sets of sub views are mutually
28 // exclusive. ContentsView manages a show state to choose one set to show 28 // exclusive. ContentsView manages a show state to choose one set to show
29 // and animates the transition between show states. 29 // and animates the transition between show states.
30 class ContentsView : public views::View { 30 class ContentsView : public views::View {
31 public: 31 public:
32 ContentsView(AppListMainView* app_list_main_view, 32 ContentsView(AppListMainView* app_list_main_view,
33 PaginationModel* pagination_model); 33 PaginationModel* pagination_model,
34 AppListModel* model);
34 virtual ~ContentsView(); 35 virtual ~ContentsView();
35 36
36 void SetModel(AppListModel* model);
37
38 // If |drag_and_drop| is not NULL it will be called upon drag and drop 37 // If |drag_and_drop| is not NULL it will be called upon drag and drop
39 // operations outside the application list. 38 // operations outside the application list.
40 void SetDragAndDropHostOfCurrentAppList( 39 void SetDragAndDropHostOfCurrentAppList(
41 app_list::ApplicationDragAndDropHost* drag_and_drop_host); 40 app_list::ApplicationDragAndDropHost* drag_and_drop_host);
42 41
43 void ShowSearchResults(bool show); 42 void ShowSearchResults(bool show);
44 43
45 void Prerender(); 44 void Prerender();
46 45
47 private: 46 private:
(...skipping 28 matching lines...) Expand all
76 75
77 scoped_ptr<views::ViewModel> view_model_; 76 scoped_ptr<views::ViewModel> view_model_;
78 scoped_ptr<views::BoundsAnimator> bounds_animator_; 77 scoped_ptr<views::BoundsAnimator> bounds_animator_;
79 78
80 DISALLOW_COPY_AND_ASSIGN(ContentsView); 79 DISALLOW_COPY_AND_ASSIGN(ContentsView);
81 }; 80 };
82 81
83 } // namespace app_list 82 } // namespace app_list
84 83
85 #endif // UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_ 84 #endif // UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/views/app_list_main_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