Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / profiles / avatar_menu_actions_chromeos.cc

diff --git a/src/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.cc b/src/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.cc
index 79e3cc6..a65eae2 100644 (file)
--- a/src/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.cc
+++ b/src/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.cc
@@ -7,9 +7,10 @@
 #include "ash/multi_profile_uma.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
-#include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/profiles/profile_info_util.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/ui/browser.h"
+#include "components/user_manager/user_manager.h"
 
 // static
 AvatarMenuActions* AvatarMenuActions::Create() {
@@ -37,23 +38,16 @@ void AvatarMenuActionsChromeOS::EditProfile(Profile* profile, size_t index) {
 
 bool AvatarMenuActionsChromeOS::ShouldShowAddNewProfileLink() const {
   // |browser_| can be NULL in unit_tests.
-  return (!browser_ || !browser_->profile()->IsManaged()) &&
-      UserManager::Get()->GetUsersAdmittedForMultiProfile().size();
+  return (!browser_ || !browser_->profile()->IsSupervised()) &&
+         user_manager::UserManager::Get()
+             ->GetUsersAdmittedForMultiProfile()
+             .size();
 }
 
 bool AvatarMenuActionsChromeOS::ShouldShowEditProfileLink() const {
   return false;
 }
 
-content::WebContents* AvatarMenuActionsChromeOS::BeginSignOut() {
-  NOTIMPLEMENTED();
-  return NULL;
-}
-
-void AvatarMenuActionsChromeOS::SetLogoutURL(const std::string& logout_url) {
-  NOTIMPLEMENTED();
-}
-
 void AvatarMenuActionsChromeOS::ActiveBrowserChanged(Browser* browser) {
   browser_ = browser;
 }