Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / login / users / chrome_user_manager_impl.cc

diff --git a/src/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc b/src/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
index 516beed..4a682de 100644 (file)
--- a/src/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
+++ b/src/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
@@ -7,7 +7,6 @@
 #include <cstddef>
 #include <set>
 
-#include "ash/multi_profile_uma.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ -59,6 +58,11 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/wm/core/wm_core_switches.h"
 
+#if !defined(USE_ATHENA)
+#include "ash/multi_profile_uma.h"
+#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
+#endif
+
 using content::BrowserThread;
 
 namespace chromeos {
@@ -193,7 +197,7 @@ SupervisedUserManager* ChromeUserManagerImpl::GetSupervisedUserManager() {
   return supervised_user_manager_.get();
 }
 
-user_manager::UserList ChromeUserManagerImpl::GetUsersAdmittedForMultiProfile()
+user_manager::UserList ChromeUserManagerImpl::GetUsersAllowedForMultiProfile()
     const {
   // Supervised users are not allowed to use multi-profiles.
   if (GetLoggedInUsers().size() == 1 &&
@@ -394,8 +398,10 @@ void ChromeUserManagerImpl::OnExternalDataSet(const std::string& policy,
                                               const std::string& user_id) {
   if (policy == policy::key::kUserAvatarImage)
     GetUserImageManager(user_id)->OnExternalDataSet(policy);
+#if !defined(USE_ATHENA)
   else if (policy == policy::key::kWallpaperImage)
     WallpaperManager::Get()->OnPolicySet(policy, user_id);
+#endif
   else
     NOTREACHED();
 }
@@ -404,8 +410,10 @@ void ChromeUserManagerImpl::OnExternalDataCleared(const std::string& policy,
                                                   const std::string& user_id) {
   if (policy == policy::key::kUserAvatarImage)
     GetUserImageManager(user_id)->OnExternalDataCleared(policy);
+#if !defined(USE_ATHENA)
   else if (policy == policy::key::kWallpaperImage)
     WallpaperManager::Get()->OnPolicyCleared(policy, user_id);
+#endif
   else
     NOTREACHED();
 }
@@ -416,8 +424,10 @@ void ChromeUserManagerImpl::OnExternalDataFetched(
     scoped_ptr<std::string> data) {
   if (policy == policy::key::kUserAvatarImage)
     GetUserImageManager(user_id)->OnExternalDataFetched(policy, data.Pass());
+#if !defined(USE_ATHENA)
   else if (policy == policy::key::kWallpaperImage)
     WallpaperManager::Get()->OnPolicyFetched(policy, user_id, data.Pass());
+#endif
   else
     NOTREACHED();
 }
@@ -605,19 +615,25 @@ void ChromeUserManagerImpl::GuestUserLoggedIn() {
       user_manager::User::USER_IMAGE_INVALID,
       false);
 
+#if !defined(USE_ATHENA)
   // Initializes wallpaper after active_user_ is set.
   WallpaperManager::Get()->SetUserWallpaperNow(chromeos::login::kGuestUserName);
+#endif
 }
 
 void ChromeUserManagerImpl::RegularUserLoggedIn(const std::string& user_id) {
   ChromeUserManager::RegularUserLoggedIn(user_id);
 
+#if !defined(USE_ATHENA)
   if (IsCurrentUserNew())
     WallpaperManager::Get()->SetUserWallpaperNow(user_id);
+#endif
 
   GetUserImageManager(user_id)->UserLoggedIn(IsCurrentUserNew(), false);
 
+#if !defined(USE_ATHENA)
   WallpaperManager::Get()->EnsureLoggedInUserWallpaperLoaded();
+#endif
 
   // Make sure that new data is persisted to Local State.
   GetLocalState()->CommitPendingWrite();
@@ -629,7 +645,9 @@ void ChromeUserManagerImpl::RegularUserLoggedInAsEphemeral(
   ChromeUserManager::RegularUserLoggedInAsEphemeral(user_id);
 
   GetUserImageManager(user_id)->UserLoggedIn(IsCurrentUserNew(), false);
+#if !defined(USE_ATHENA)
   WallpaperManager::Get()->SetUserWallpaperNow(user_id);
+#endif
 }
 
 void ChromeUserManagerImpl::SupervisedUserLoggedIn(const std::string& user_id) {
@@ -643,11 +661,15 @@ void ChromeUserManagerImpl::SupervisedUserLoggedIn(const std::string& user_id) {
     SetIsCurrentUserNew(true);
     active_user_ = user_manager::User::CreateSupervisedUser(user_id);
     // Leaving OAuth token status at the default state = unknown.
+#if !defined(USE_ATHENA)
     WallpaperManager::Get()->SetUserWallpaperNow(user_id);
+#endif
   } else {
     if (supervised_user_manager_->CheckForFirstRun(user_id)) {
       SetIsCurrentUserNew(true);
+#if !defined(USE_ATHENA)
       WallpaperManager::Get()->SetUserWallpaperNow(user_id);
+#endif
     } else {
       SetIsCurrentUserNew(false);
     }
@@ -665,7 +687,9 @@ void ChromeUserManagerImpl::SupervisedUserLoggedIn(const std::string& user_id) {
   }
 
   GetUserImageManager(user_id)->UserLoggedIn(IsCurrentUserNew(), true);
+#if !defined(USE_ATHENA)
   WallpaperManager::Get()->EnsureLoggedInUserWallpaperLoaded();
+#endif
 
   // Make sure that new data is persisted to Local State.
   GetLocalState()->CommitPendingWrite();
@@ -680,7 +704,9 @@ void ChromeUserManagerImpl::PublicAccountUserLoggedIn(
   // for the first time. Tell the UserImageManager that this user is not new to
   // prevent the avatar from getting changed.
   GetUserImageManager(user->email())->UserLoggedIn(false, true);
+#if !defined(USE_ATHENA)
   WallpaperManager::Get()->EnsureLoggedInUserWallpaperLoaded();
+#endif
 }
 
 void ChromeUserManagerImpl::KioskAppLoggedIn(const std::string& app_id) {
@@ -698,7 +724,9 @@ void ChromeUserManagerImpl::KioskAppLoggedIn(const std::string& app_id) {
       user_manager::User::USER_IMAGE_INVALID,
       false);
 
+#if !defined(USE_ATHENA)
   WallpaperManager::Get()->SetUserWallpaperNow(app_id);
+#endif
 
   // TODO(bartfab): Add KioskAppUsers to the users_ list and keep metadata like
   // the kiosk_app_id in these objects, removing the need to re-parse the
@@ -742,7 +770,9 @@ void ChromeUserManagerImpl::DemoAccountLoggedIn() {
               IDR_PROFILE_PICTURE_LOADING)),
       user_manager::User::USER_IMAGE_INVALID,
       false);
+#if !defined(USE_ATHENA)
   WallpaperManager::Get()->SetUserWallpaperNow(DemoAppLauncher::kDemoUserName);
+#endif
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   command_line->AppendSwitch(::switches::kForceAppMode);
@@ -761,8 +791,10 @@ void ChromeUserManagerImpl::RetailModeUserLoggedIn() {
   active_user_ = user_manager::User::CreateRetailModeUser();
   GetUserImageManager(chromeos::login::kRetailModeUserName)
       ->UserLoggedIn(IsCurrentUserNew(), true);
+#if !defined(USE_ATHENA)
   WallpaperManager::Get()->SetUserWallpaperNow(
       chromeos::login::kRetailModeUserName);
+#endif
 }
 
 void ChromeUserManagerImpl::NotifyOnLogin() {
@@ -794,7 +826,9 @@ void ChromeUserManagerImpl::RemoveNonCryptohomeData(
     const std::string& user_id) {
   ChromeUserManager::RemoveNonCryptohomeData(user_id);
 
+#if !defined(USE_ATHENA)
   WallpaperManager::Get()->RemoveUserWallpaperInfo(user_id);
+#endif
   GetUserImageManager(user_id)->DeleteUserImage();
 
   supervised_user_manager_->RemoveNonCryptohomeData(user_id);
@@ -1028,12 +1062,14 @@ void ChromeUserManagerImpl::OnUserNotAllowed(const std::string& user_email) {
 }
 
 void ChromeUserManagerImpl::UpdateNumberOfUsers() {
+#if !defined(USE_ATHENA)
   size_t users = GetLoggedInUsers().size();
   if (users) {
     // Write the user number as UMA stat when a multi user session is possible.
-    if ((users + GetUsersAdmittedForMultiProfile().size()) > 1)
+    if ((users + GetUsersAllowedForMultiProfile().size()) > 1)
       ash::MultiProfileUMA::RecordUserCount(users);
   }
+#endif
 
   base::debug::SetCrashKeyValue(
       crash_keys::kNumberOfUsers,