[cros] user_manager component - move UserManagerBase and UserManager

chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc

 // Copyright (c) 2013 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/ui/webui/chromeos/login/terms_of_service_screen_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_split.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/base/locale_util.h"
 #include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "components/user_manager/user.h"
+#include "components/user_manager/user_manager.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
 namespace {
 
 const char kJsScreenPath[] = "login.TermsOfServiceScreen";
 
 }  // namespace
 
@@ skipping 40 matching lines @@
 void TermsOfServiceScreenHandler::SetDelegate(Delegate* screen) {
   screen_ = screen;
 }
 
 void TermsOfServiceScreenHandler::Show() {
   if (!page_is_ready()) {
     show_on_init_ = true;
     return;
   }
 
-  const std::string locale = ProfileHelper::Get()->GetProfileByUser(
-      UserManager::Get()->GetActiveUser())->GetPrefs()->GetString(
-          prefs::kApplicationLocale);
+  const std::string locale =
+      ProfileHelper::Get()
+          ->GetProfileByUser(user_manager::UserManager::Get()->GetActiveUser())

[Dmitry Polukhin, 2014/08/12 09:03:13]

ProfileManager::GetActiveUserProfile()?

[Nikita (slow), 2014/08/12 09:34:42]

Done.

+          ->GetPrefs()
+          ->GetString(prefs::kApplicationLocale);
   if (locale.empty() || locale == g_browser_process->GetApplicationLocale()) {
     // If the user has not chosen a UI locale yet or the chosen locale matches
     // the current UI locale, show the screen immediately.
     DoShow();
     return;
   }
 
   // Switch to the user's UI locale before showing the screen.
   scoped_ptr<locale_util::SwitchLanguageCallback> callback(
       new locale_util::SwitchLanguageCallback(
@@ skipping 43 matching lines @@
       ->GetLocalizedStrings(&localized_strings);
   core_oobe_actor_->ReloadContent(localized_strings);
 
   DoShow();
 }
 
 void TermsOfServiceScreenHandler::DoShow() {
   // Determine the user's most preferred input method.
   std::vector<std::string> input_methods;
   base::SplitString(
-      ProfileHelper::Get()->GetProfileByUser(
-          UserManager::Get()->GetActiveUser())->GetPrefs()->GetString(
-              prefs::kLanguagePreloadEngines),
+      ProfileHelper::Get()
+          ->GetProfileByUser(user_manager::UserManager::Get()->GetActiveUser())

[Dmitry Polukhin, 2014/08/12 09:03:13]

Use ProfileManager::GetActiveUserProfile()?

[Nikita (slow), 2014/08/12 09:34:42]

Done.

+          ->GetPrefs()
+          ->GetString(prefs::kLanguagePreloadEngines),
       ',',
       &input_methods);
 
   if (!input_methods.empty()) {
     // If the user has a preferred input method, enable it and switch to it.
     chromeos::input_method::InputMethodManager* input_method_manager =
         chromeos::input_method::InputMethodManager::Get();
     input_method_manager->EnableInputMethod(input_methods.front());
     input_method_manager->ChangeInputMethod(input_methods.front());
   }
@@ skipping 39 matching lines @@
   // and continue" button should not be accessible. If the user managed to
   // activate it somehow anway, do not treat this as acceptance of the Terms
   // and Conditions and end the session instead, as if the user had declined.
   if (terms_of_service_.empty())
     screen_->OnDecline();
   else
     screen_->OnAccept();
 }
 
 }  // namespace chromeos