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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc

Issue 2573703003: chromeos: Fix shelf appearing at login screen under mash (Closed)
Patch Set: msw comments Created 4 years 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: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
index be80e2d21ce205896f2e12f12e0467365c6b57cc..2842126fe249c9df85c8827da4da1f05910326cc 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
@@ -192,6 +192,7 @@ class LauncherPlatformAppBrowserTest
void RunTestOnMainThreadLoop() override {
controller_ = GetChromeLauncherControllerImpl();
+ ASSERT_TRUE(controller_);
return extensions::PlatformAppBrowserTest::RunTestOnMainThreadLoop();
}
@@ -262,6 +263,7 @@ class ShelfAppBrowserTest : public ExtensionBrowserTest {
ash::WmShelf::ForWindow(ash::WmShell::Get()->GetPrimaryRootWindow());
model_ = ash::WmShell::Get()->shelf_model();
controller_ = GetChromeLauncherControllerImpl();
+ ASSERT_TRUE(controller_);
return ExtensionBrowserTest::RunTestOnMainThreadLoop();
}
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698