chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc - Issue 2619943002: Revert "chromeos: Fix shelf appearing at login screen under mash"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2619943002: Revert "chromeos: Fix shelf appearing at login screen under mash" (Closed)

Patch Set: Created 3 years, 11 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 | « 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 »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 5e1d861052c2b0ad9342473e8677a4f98c4a1c31..6d97da2bfab846d8a425275ce3e8365494616295 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,7 +192,6 @@ class LauncherPlatformAppBrowserTest

void RunTestOnMainThreadLoop() override {

controller_ = GetChromeLauncherControllerImpl();

- ASSERT_TRUE(controller_);

return extensions::PlatformAppBrowserTest::RunTestOnMainThreadLoop();

}

@@ -263,7 +262,6 @@ 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();

}