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

Unified Diff: ui/app_list/views/app_list_main_view_unittest.cc

Issue 657653002: Move app list search box into AppListView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/app_list/views/app_list_main_view.cc ('k') | ui/app_list/views/app_list_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/app_list_main_view_unittest.cc
diff --git a/ui/app_list/views/app_list_main_view_unittest.cc b/ui/app_list/views/app_list_main_view_unittest.cc
index 8f744d101d74ae2dfca8922c0bc7ae93d21ea8a8..4514716e043fc10831ccb27833c4d21bf786ba37 100644
--- a/ui/app_list/views/app_list_main_view_unittest.cc
+++ b/ui/app_list/views/app_list_main_view_unittest.cc
@@ -16,6 +16,7 @@
#include "ui/app_list/views/apps_container_view.h"
#include "ui/app_list/views/apps_grid_view.h"
#include "ui/app_list/views/contents_view.h"
+#include "ui/app_list/views/search_box_view.h"
#include "ui/app_list/views/test/apps_grid_view_test_api.h"
#include "ui/views/test/views_test_base.h"
#include "ui/views/view_model.h"
@@ -79,7 +80,8 @@ class AppListMainViewTest : public views::ViewsTestBase {
main_view_ = new AppListMainView(delegate_.get());
main_view_->SetPaintToLayer(true);
main_view_->model()->SetFoldersEnabled(true);
- main_view_->Init(NULL, 0);
+ search_box_view_.reset(new SearchBoxView(main_view_, delegate_.get()));
+ main_view_->Init(NULL, 0, search_box_view_.get());
widget_ = new views::Widget;
views::Widget::InitParams params =
@@ -93,6 +95,7 @@ class AppListMainViewTest : public views::ViewsTestBase {
virtual void TearDown() override {
widget_->Close();
views::ViewsTestBase::TearDown();
+ search_box_view_.reset();
delegate_.reset();
}
@@ -229,6 +232,7 @@ class AppListMainViewTest : public views::ViewsTestBase {
views::Widget* widget_; // Owned by native window.
AppListMainView* main_view_; // Owned by |widget_|.
scoped_ptr<AppListTestViewDelegate> delegate_;
+ scoped_ptr<SearchBoxView> search_box_view_;
private:
DISALLOW_COPY_AND_ASSIGN(AppListMainViewTest);
« no previous file with comments | « ui/app_list/views/app_list_main_view.cc ('k') | ui/app_list/views/app_list_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698