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

Unified Diff: ash/shelf/shelf_layout_manager_unittest.cc

Issue 2288993002: ash: Move AppList support to ShelfWidget, expose ShelfWidget in WmShelf (Closed)
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
Index: ash/shelf/shelf_layout_manager_unittest.cc
diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc
index 0f1374ec8a0e84cf5288b0516f71fa1de29d474a..6f3ea0d49895769be6ebe9532845ca0b143cf634 100644
--- a/ash/shelf/shelf_layout_manager_unittest.cc
+++ b/ash/shelf/shelf_layout_manager_unittest.cc
@@ -65,7 +65,7 @@ void StepWidgetLayerAnimatorToEnd(views::Widget* widget) {
}
ShelfWidget* GetShelfWidget() {
- return test::AshTestBase::GetPrimaryShelf()->GetShelfWidgetForTesting();
+ return test::AshTestBase::GetPrimaryShelf()->shelf_widget();
}
ShelfLayoutManager* GetShelfLayoutManager() {
@@ -1780,7 +1780,7 @@ TEST_F(ShelfLayoutManagerTest, BubbleEnlargesShelfMouseHitArea) {
WmShelf* shelf = GetPrimaryShelf();
ShelfLayoutManager* layout_manager = GetShelfLayoutManager();
StatusAreaWidget* status_area_widget =
- shelf->GetShelfWidgetForTesting()->status_area_widget();
+ shelf->shelf_widget()->status_area_widget();
SystemTray* tray = GetPrimarySystemTray();
// Create a visible window so auto-hide behavior is enforced.

Powered by Google App Engine
This is Rietveld 408576698