chrome/browser/chromeos/login/ui/user_adding_screen.cc - Issue 689683004: Make login code not depend on Ash when use_athena=1

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/chromeos/login/ui/user_adding_screen.cc

Issue 689683004: Make login code not depend on Ash when use_athena=1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash44_ui

Patch Set: Created 6 years, 2 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

« chrome/browser/chromeos/login/ui/login_display_host_impl.cc ('K') | « chrome/browser/chromeos/login/ui/login_display_host_impl.cc ('k') | chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/ui/user_adding_screen.cc

diff --git a/chrome/browser/chromeos/login/ui/user_adding_screen.cc b/chrome/browser/chromeos/login/ui/user_adding_screen.cc

index dff234120b33f8bbadc3c61b81448b91ef452eb9..e10184cbf711491f35c02113849fed056894d81a 100644

--- a/chrome/browser/chromeos/login/ui/user_adding_screen.cc

+++ b/chrome/browser/chromeos/login/ui/user_adding_screen.cc

@@ -4,8 +4,6 @@

#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/memory/singleton.h"

#include "base/observer_list.h"

@@ -19,6 +17,8 @@

#include "ui/gfx/size.h"

#if !defined(USE_ATHENA)

+#include "ash/shell.h"

+#include "ash/system/tray/system_tray.h"

#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"

#endif

@@ -66,8 +66,10 @@ void UserAddingScreenImpl::Start() {

void UserAddingScreenImpl::Cancel() {

CHECK(IsRunning());

+#if !defined(USE_ATHENA)

// Make sure that system tray is enabled after this flow.

ash::Shell::GetInstance()->GetPrimarySystemTray()->SetEnabled(true);

+#endif

display_host_->Finalize();

#if !defined(USE_ATHENA)