Added affiliation IDs for the new affiliation determination.

chrome/browser/chromeos/login/users/chrome_user_manager_impl.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/users/chrome_user_manager_impl.h"
 
 #include <cstddef>
 #include <set>
 
 #include "ash/multi_profile_uma.h"
@@ skipping 11 matching lines @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/chromeos/login/signin/auth_sync_observer.h"
 #include "chrome/browser/chromeos/login/signin/auth_sync_observer_factory.h"
+#include "chrome/browser/chromeos/login/users/affiliation.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h"
 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager_impl.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/session_length_limiter.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
@@ skipping 45 matching lines @@
 }
 
 }  // namespace
 
 // static
 void ChromeUserManagerImpl::RegisterPrefs(PrefRegistrySimple* registry) {
   ChromeUserManager::RegisterPrefs(registry);
 
   registry->RegisterListPref(kPublicAccounts);
   registry->RegisterStringPref(kPublicAccountPendingDataRemoval, std::string());
+
   SupervisedUserManager::RegisterPrefs(registry);
   SessionLengthLimiter::RegisterPrefs(registry);
   BootstrapManager::RegisterPrefs(registry);
 }
 
 // static
 scoped_ptr<ChromeUserManager> ChromeUserManagerImpl::CreateChromeUserManager() {
   return scoped_ptr<ChromeUserManager>(new ChromeUserManagerImpl());
 }
 
@@ skipping 1007 matching lines @@
   }
 
   if (profile->GetPrefs()->GetBoolean(prefs::kResolveTimezoneByGeolocation) &&
       !system::HasSystemTimezonePolicy()) {
     g_browser_process->platform_part()->GetTimezoneResolver()->Start();
   } else {
     g_browser_process->platform_part()->GetTimezoneResolver()->Stop();
   }
 }
 
+void ChromeUserManagerImpl::SetUserAffiliation(
+    const std::string& user_id,
+    const std::set<std::string>& user_affiliation_ids) {
+  LOG(ERROR) << "SetUserAffiliation is not implemented yet. Called for user: "

[Mattias Nissler (ping if slow), 2015/07/30 12:10:57]

remove LOG lines

[peletskyi, 2015/07/30 14:10:57]

Done.

+             << user_id;
+  user_manager::User* user = FindUserAndModify(user_id);
+  if (user) {
+    policy::BrowserPolicyConnectorChromeOS const* const connector =
+        g_browser_process->platform_part()->browser_policy_connector_chromeos();
+    LOG(ERROR) << "Affiliation to set: "

[Mattias Nissler (ping if slow), 2015/07/30 12:10:57]

You should actually set the affiliation here by calling User->SetAffiliation().
Any reason to not add User::SetAffiliation and the corresponding getter in this
CL?

[peletskyi, 2015/07/30 14:10:57]

Done.

+               << chromeos::IsUserAffiliated(
+                      user_affiliation_ids,
+                      connector->GetDeviceAffiliationIDs(), user_id,
+                      connector->GetEnterpriseDomain());
+  }
+}
+
 }  // namespace chromeos