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

Side by Side Diff: ui/app_list/views/app_list_main_view_unittest.cc

Issue 2639203007: Update SetPaintToLayer to accept LayerType (Closed)
Patch Set: fix comments Created 3 years, 10 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 #include "ui/app_list/views/app_list_main_view.h" 5 #include "ui/app_list/views/app_list_main_view.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 79
80 // testing::Test overrides: 80 // testing::Test overrides:
81 void SetUp() override { 81 void SetUp() override {
82 views::ViewsTestBase::SetUp(); 82 views::ViewsTestBase::SetUp();
83 delegate_.reset(new AppListTestViewDelegate); 83 delegate_.reset(new AppListTestViewDelegate);
84 84
85 // In Ash, the third argument is a container aura::Window, but it is always 85 // In Ash, the third argument is a container aura::Window, but it is always
86 // NULL on Windows, and not needed for tests. It is only used to determine 86 // NULL on Windows, and not needed for tests. It is only used to determine
87 // the scale factor for preloading icons. 87 // the scale factor for preloading icons.
88 main_view_ = new AppListMainView(delegate_.get()); 88 main_view_ = new AppListMainView(delegate_.get());
89 main_view_->SetPaintToLayer(true); 89 main_view_->SetPaintToLayer();
90 main_view_->model()->SetFoldersEnabled(true); 90 main_view_->model()->SetFoldersEnabled(true);
91 search_box_view_ = new SearchBoxView(main_view_, delegate_.get()); 91 search_box_view_ = new SearchBoxView(main_view_, delegate_.get());
92 main_view_->Init(nullptr, 0, search_box_view_); 92 main_view_->Init(nullptr, 0, search_box_view_);
93 93
94 main_widget_ = new views::Widget; 94 main_widget_ = new views::Widget;
95 views::Widget::InitParams main_widget_params = 95 views::Widget::InitParams main_widget_params =
96 CreateParams(views::Widget::InitParams::TYPE_POPUP); 96 CreateParams(views::Widget::InitParams::TYPE_POPUP);
97 main_widget_params.bounds.set_size(main_view_->GetPreferredSize()); 97 main_widget_params.bounds.set_size(main_view_->GetPreferredSize());
98 main_widget_->Init(main_widget_params); 98 main_widget_->Init(main_widget_params);
99 main_widget_->SetContentsView(main_view_); 99 main_widget_->SetContentsView(main_view_);
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 // The app list model should remain unchanged. 449 // The app list model should remain unchanged.
450 EXPECT_EQ(1, FolderViewModel()->view_size()); 450 EXPECT_EQ(1, FolderViewModel()->view_size());
451 EXPECT_EQ(2, RootViewModel()->view_size()); 451 EXPECT_EQ(2, RootViewModel()->view_size());
452 EXPECT_EQ(folder_id, RootGridView()->GetItemViewAt(0)->item()->id()); 452 EXPECT_EQ(folder_id, RootGridView()->GetItemViewAt(0)->item()->id());
453 EXPECT_NE(nullptr, 453 EXPECT_NE(nullptr,
454 delegate_->GetTestModel()->FindFolderItem("single_item_folder")); 454 delegate_->GetTestModel()->FindFolderItem("single_item_folder"));
455 } 455 }
456 456
457 } // namespace test 457 } // namespace test
458 } // namespace app_list 458 } // namespace app_list
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698