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

Unified Diff: ui/app_list/views/contents_view.h

Issue 291653003: Add a unit test for the experimental app list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 7 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
« no previous file with comments | « ui/app_list/views/app_list_view_unittest.cc ('k') | ui/app_list/views/contents_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/contents_view.h
diff --git a/ui/app_list/views/contents_view.h b/ui/app_list/views/contents_view.h
index 8348064d9b624973d8299ebe85c22f5cd5090a48..f51eef0d9d2b4c7e4a873a308f2b38a0cc4fb9e9 100644
--- a/ui/app_list/views/contents_view.h
+++ b/ui/app_list/views/contents_view.h
@@ -8,6 +8,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
+#include "ui/app_list/app_list_export.h"
#include "ui/views/view.h"
namespace content {
@@ -35,7 +36,7 @@ class StartPageView;
// switcher and search results). The two sets of sub views are mutually
// exclusive. ContentsView manages a show state to choose one set to show
// and animates the transition between show states.
-class ContentsView : public views::View {
+class APP_LIST_EXPORT ContentsView : public views::View {
public:
enum ShowState {
SHOW_APPS,
@@ -66,6 +67,7 @@ class ContentsView : public views::View {
void Prerender();
AppsContainerView* apps_container_view() { return apps_container_view_; }
+ StartPageView* start_page_view() { return start_page_view_; }
ShowState show_state() const { return show_state_; }
@@ -90,6 +92,8 @@ class ContentsView : public views::View {
PaginationModel* pagination_model_; // Owned by AppListController.
AppsContainerView* apps_container_view_; // Owned by the views hierarchy.
+ StartPageView* start_page_view_; // Owned by the views hierarchy.
+
AppListMainView* app_list_main_view_; // Parent view, owns this.
scoped_ptr<views::ViewModel> view_model_;
« no previous file with comments | « ui/app_list/views/app_list_view_unittest.cc ('k') | ui/app_list/views/contents_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698