| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_view.h" | 5 #include "ui/app_list/views/app_list_view.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 AppListViewTestContext* parent_; | 168 AppListViewTestContext* parent_; |
| 169 | 169 |
| 170 DISALLOW_COPY_AND_ASSIGN(UnitTestViewDelegate); | 170 DISALLOW_COPY_AND_ASSIGN(UnitTestViewDelegate); |
| 171 }; | 171 }; |
| 172 | 172 |
| 173 AppListViewTestContext::AppListViewTestContext(gfx::NativeView parent) { | 173 AppListViewTestContext::AppListViewTestContext(gfx::NativeView parent) { |
| 174 delegate_.reset(new UnitTestViewDelegate(this)); | 174 delegate_.reset(new UnitTestViewDelegate(this)); |
| 175 view_ = new app_list::AppListView(delegate_.get()); | 175 view_ = new app_list::AppListView(delegate_.get()); |
| 176 | 176 |
| 177 // Initialize centered around a point that ensures the window is wholly shown. | 177 // Initialize centered around a point that ensures the window is wholly shown. |
| 178 view_->InitAsBubbleAtFixedLocation(parent, | 178 view_->InitAsBubble(parent, 0); |
| 179 0, | 179 view_->SetAnchorPoint(gfx::Point(300, 300)); |
| 180 gfx::Point(300, 300), | |
| 181 views::BubbleBorder::FLOAT, | |
| 182 false /* border_accepts_events */); | |
| 183 } | 180 } |
| 184 | 181 |
| 185 AppListViewTestContext::~AppListViewTestContext() { | 182 AppListViewTestContext::~AppListViewTestContext() { |
| 186 // The view observes the PaginationModel which is about to get destroyed, so | 183 // The view observes the PaginationModel which is about to get destroyed, so |
| 187 // if the view is not already deleted by the time this destructor is called, | 184 // if the view is not already deleted by the time this destructor is called, |
| 188 // there will be problems. | 185 // there will be problems. |
| 189 EXPECT_FALSE(view_); | 186 EXPECT_FALSE(view_); |
| 190 } | 187 } |
| 191 | 188 |
| 192 // static | 189 // static |
| (...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 751 TEST_F(AppListViewTestAura, AppListOverlayTest) { | 748 TEST_F(AppListViewTestAura, AppListOverlayTest) { |
| 752 EXPECT_NO_FATAL_FAILURE(test_context_->RunAppListOverlayTest()); | 749 EXPECT_NO_FATAL_FAILURE(test_context_->RunAppListOverlayTest()); |
| 753 } | 750 } |
| 754 | 751 |
| 755 TEST_F(AppListViewTestDesktop, AppListOverlayTest) { | 752 TEST_F(AppListViewTestDesktop, AppListOverlayTest) { |
| 756 EXPECT_NO_FATAL_FAILURE(test_context_->RunAppListOverlayTest()); | 753 EXPECT_NO_FATAL_FAILURE(test_context_->RunAppListOverlayTest()); |
| 757 } | 754 } |
| 758 | 755 |
| 759 } // namespace test | 756 } // namespace test |
| 760 } // namespace app_list | 757 } // namespace app_list |
| OLD | NEW |