Index: chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc |
diff --git a/chrome/browser/chromeos/login/managed/locally_managed_user_login_flow.cc b/chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc |
similarity index 74% |
rename from chrome/browser/chromeos/login/managed/locally_managed_user_login_flow.cc |
rename to chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc |
index f4a4f25ebc133ed8ee873b738fc53fe6f8b29c78..5efe220c5f5c72a0fbd4464959e2003512407f87 100644 |
--- a/chrome/browser/chromeos/login/managed/locally_managed_user_login_flow.cc |
+++ b/chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc |
@@ -2,7 +2,7 @@ |
// 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/managed/locally_managed_user_login_flow.h" |
+#include "chrome/browser/chromeos/login/managed/supervised_user_login_flow.h" |
#include "base/file_util.h" |
#include "base/files/file_path.h" |
@@ -15,6 +15,8 @@ |
#include "chrome/browser/chromeos/login/login_utils.h" |
#include "chrome/browser/chromeos/login/managed/locally_managed_user_constants.h" |
#include "chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.h" |
+#include "chrome/browser/chromeos/login/supervised_user_manager.h" |
Nikita (slow)
2013/12/09 16:42:16
nit: not used.
Denis Kuznetsov (DE-MUC)
2013/12/12 19:45:24
Done.
|
+#include "chrome/browser/chromeos/login/user_manager.h" |
#include "chrome/browser/chromeos/login/wizard_controller.h" |
#include "chrome/browser/chromeos/profiles/profile_helper.h" |
#include "chrome/browser/managed_mode/managed_user_service.h" |
@@ -31,7 +33,7 @@ std::string LoadSyncToken(base::FilePath profile_dir) { |
std::string token; |
base::FilePath token_file = |
profile_dir.Append(kManagedUserTokenFilename); |
- LOG(INFO) << "Loading" << token_file.value(); |
+ VLOG(1) << "Loading" << token_file.value(); |
if (!base::ReadFileToString(token_file, &token)) { |
return std::string(); |
} |
@@ -40,43 +42,43 @@ std::string LoadSyncToken(base::FilePath profile_dir) { |
} // namespace |
-LocallyManagedUserLoginFlow::LocallyManagedUserLoginFlow( |
+SupervisedUserLoginFlow::SupervisedUserLoginFlow( |
const std::string& user_id) |
: ExtendedUserFlow(user_id), |
data_loaded_(false), |
weak_factory_(this) { |
} |
-LocallyManagedUserLoginFlow::~LocallyManagedUserLoginFlow() {} |
+SupervisedUserLoginFlow::~SupervisedUserLoginFlow() {} |
-bool LocallyManagedUserLoginFlow::ShouldLaunchBrowser() { |
+bool SupervisedUserLoginFlow::ShouldLaunchBrowser() { |
return data_loaded_; |
} |
-bool LocallyManagedUserLoginFlow::ShouldSkipPostLoginScreens() { |
+bool SupervisedUserLoginFlow::ShouldSkipPostLoginScreens() { |
return true; |
} |
-bool LocallyManagedUserLoginFlow::HandleLoginFailure( |
+bool SupervisedUserLoginFlow::HandleLoginFailure( |
const LoginFailure& failure) { |
return false; |
} |
-bool LocallyManagedUserLoginFlow::HandlePasswordChangeDetected() { |
+bool SupervisedUserLoginFlow::HandlePasswordChangeDetected() { |
return false; |
} |
-void LocallyManagedUserLoginFlow::HandleOAuthTokenStatusChange( |
+void SupervisedUserLoginFlow::HandleOAuthTokenStatusChange( |
User::OAuthTokenStatus status) { |
} |
-void LocallyManagedUserLoginFlow::OnSyncSetupDataLoaded( |
+void SupervisedUserLoginFlow::OnSyncSetupDataLoaded( |
const std::string& token) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
ConfigureSync(token); |
} |
-void LocallyManagedUserLoginFlow::ConfigureSync(const std::string& token) { |
+void SupervisedUserLoginFlow::ConfigureSync(const std::string& token) { |
data_loaded_ = true; |
// TODO(antrim): add error handling (no token loaded). |
// See also: http://crbug.com/312751 |
@@ -88,7 +90,7 @@ void LocallyManagedUserLoginFlow::ConfigureSync(const std::string& token) { |
UnregisterFlowSoon(); |
} |
-void LocallyManagedUserLoginFlow::LaunchExtraSteps( |
+void SupervisedUserLoginFlow::LaunchExtraSteps( |
Profile* profile) { |
profile_ = profile; |
base::FilePath profile_dir = ProfileHelper::GetProfilePathByUserIdHash( |
@@ -98,7 +100,7 @@ void LocallyManagedUserLoginFlow::LaunchExtraSteps( |
FROM_HERE, |
base::Bind(&LoadSyncToken, profile_dir), |
base::Bind( |
- &LocallyManagedUserLoginFlow::OnSyncSetupDataLoaded, |
+ &SupervisedUserLoginFlow::OnSyncSetupDataLoaded, |
weak_factory_.GetWeakPtr())); |
} |