Commit 0878dffc authored by Evan Stade's avatar Evan Stade Committed by Commit Bot

Remove an ash reference from the user adding screen.

      system tray still works

Bug: 327885
Test: sign into one user, start signin to a second user, cancel;
Change-Id: I9fa93bbd87a1f4a0087746e3a42ead07ee308710
Reviewed-on: https://chromium-review.googlesource.com/1008825
Commit-Queue: Evan Stade <estade@chromium.org>
Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551120}
parent 1adbfdec
...@@ -4,8 +4,6 @@ ...@@ -4,8 +4,6 @@
#include "chrome/browser/chromeos/login/ui/user_adding_screen.h" #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
#include "ash/shell.h"
#include "ash/system/tray/system_tray.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/memory/singleton.h" #include "base/memory/singleton.h"
#include "base/observer_list.h" #include "base/observer_list.h"
...@@ -62,8 +60,6 @@ void UserAddingScreenImpl::Start() { ...@@ -62,8 +60,6 @@ void UserAddingScreenImpl::Start() {
void UserAddingScreenImpl::Cancel() { void UserAddingScreenImpl::Cancel() {
CHECK(IsRunning()); CHECK(IsRunning());
// Make sure that system tray is enabled after this flow.
ash::Shell::Get()->GetPrimarySystemTray()->SetEnabled(true);
display_host_->CancelUserAdding(); display_host_->CancelUserAdding();
// Reset wallpaper if cancel adding user from multiple user sign in page. // Reset wallpaper if cancel adding user from multiple user sign in page.
......
...@@ -247,9 +247,6 @@ ...@@ -247,9 +247,6 @@
# ash::Shell access in test. # ash::Shell access in test.
-TrayAccessibilityTestInstance/TrayAccessibilityTest.* -TrayAccessibilityTestInstance/TrayAccessibilityTest.*
# chromeos::UserAddingScreenImpl::Cancel() uses ash::Shell to enable system tray.
-UserAddingScreenTest.*
# Virtual keyboard not supported. # Virtual keyboard not supported.
-AccessibilityManagerLoginTest.ResumeSavedPref -AccessibilityManagerLoginTest.ResumeSavedPref
-DefaultKeyboardExtensionBrowserTest.* -DefaultKeyboardExtensionBrowserTest.*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment