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

Unified Diff: ash/shelf/shelf_view_unittest.cc

Issue 2750483005: Moves app_list() and related functions from Shell to WmShell (Closed)
Patch Set: dont explicitly delete Created 3 years, 9 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 | « ash/common/wm_shell.cc ('k') | ash/shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_view_unittest.cc
diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc
index 5ca11b6c88e3d05b5d5a124ccf1d4d2f5fa0e243..f8f81108c132fe5ea666c185e4bb77a799ca3a83 100644
--- a/ash/shelf/shelf_view_unittest.cc
+++ b/ash/shelf/shelf_view_unittest.cc
@@ -1476,8 +1476,8 @@ TEST_F(ShelfViewTest, ShouldHideTooltipTest) {
TEST_F(ShelfViewTest, ShouldHideTooltipWithAppListWindowTest) {
// Trigger mock notifications that the app list was shown.
- WmShell::Get()->app_list()->OnTargetVisibilityChanged(true);
- WmShell::Get()->app_list()->OnVisibilityChanged(true, GetPrimaryDisplayId());
+ Shell::Get()->app_list()->OnTargetVisibilityChanged(true);
+ Shell::Get()->app_list()->OnVisibilityChanged(true, GetPrimaryDisplayId());
AppListButton* app_list_button = shelf_view_->GetAppListButton();
app_list_button->OnAppListShown();
@@ -2042,19 +2042,19 @@ class ShelfViewInkDropTest : public ShelfViewTest {
void ShowAppList() {
// Trigger a mock notification that the app list was shown.
- WmShell::Get()->app_list()->OnTargetVisibilityChanged(true);
+ Shell::Get()->app_list()->OnTargetVisibilityChanged(true);
app_list_button_->OnAppListShown();
}
void DismissAppList() {
// Trigger a mock notification that the app list was dismissed.
- WmShell::Get()->app_list()->OnTargetVisibilityChanged(false);
+ Shell::Get()->app_list()->OnTargetVisibilityChanged(false);
app_list_button_->OnAppListDismissed();
}
void FinishAppListVisibilityChange() {
// Trigger a mock notification that the app list finished animating.
- app_list::AppList* app_list = WmShell::Get()->app_list();
+ app_list::AppList* app_list = Shell::Get()->app_list();
app_list->OnVisibilityChanged(app_list->GetTargetVisibility(),
GetPrimaryDisplayId());
}
« no previous file with comments | « ash/common/wm_shell.cc ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698