Make login code not depend on Ash when use_athena=1

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen_input_methods_controller.h"
 #include "components/session_manager/core/session_manager.h"
 #include "components/user_manager/user_manager.h"
 #include "ui/gfx/rect.h"
 #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
 
 namespace chromeos {
 
 namespace {
 
 class UserAddingScreenImpl : public UserAddingScreen {
  public:
   virtual void Start() override;
@@ skipping 27 matching lines @@
                  base::Unretained(this)));
 
   g_browser_process->platform_part()->SessionManager()->SetSessionState(
       session_manager::SESSION_STATE_LOGIN_SECONDARY);
   FOR_EACH_OBSERVER(Observer, observers_, OnUserAddingStarted());
 }
 
 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)
   // Reset wallpaper if cancel adding user from multiple user sign in page.
   if (user_manager::UserManager::Get()->IsUserLoggedIn()) {
     WallpaperManager::Get()->SetUserWallpaperDelayed(
         user_manager::UserManager::Get()->GetActiveUser()->email());
   }
 #endif
 }
@@ skipping 35 matching lines @@
 
 UserAddingScreen::UserAddingScreen() {}
 UserAddingScreen::~UserAddingScreen() {}
 
 UserAddingScreen* UserAddingScreen::Get() {
   return UserAddingScreenImpl::GetInstance();
 }
 
 }  // namespace chromeos