diff options
| author | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 22:31:56 +0000 |
|---|---|---|
| committer | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 22:31:56 +0000 |
| commit | fa6f3e8cf3db2a69816f98b79679cc9a68b6c1b6 (patch) | |
| tree | 544a59976dfc48e564fb49ff37d5aa694fcb8e4d | |
| parent | 54383cba353f0db58536c8d3b49388a14931e83c (diff) | |
| download | chromium_src-fa6f3e8cf3db2a69816f98b79679cc9a68b6c1b6.zip chromium_src-fa6f3e8cf3db2a69816f98b79679cc9a68b6c1b6.tar.gz chromium_src-fa6f3e8cf3db2a69816f98b79679cc9a68b6c1b6.tar.bz2 | |
Enable supervised users password sync/import on ChromeOS
TBR=nkostylev@chromium.org
BUG=282464, 244472
Review URL: https://codereview.chromium.org/224343003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261551 0039d316-1c4b-4281-b951-d872f2087c98
4 files changed, 1 insertions, 17 deletions
diff --git a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc index d16a7eb..5d263c7 100644 --- a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc +++ b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc @@ -6,7 +6,6 @@ #include "ash/desktop_background/desktop_background_controller.h" #include "ash/shell.h" -#include "base/command_line.h" #include "base/rand_util.h" #include "base/values.h" #include "chrome/browser/chromeos/camera_detector.h" @@ -26,7 +25,6 @@ #include "chrome/browser/managed_mode/managed_user_shared_settings_service_factory.h" #include "chrome/browser/managed_mode/managed_user_sync_service.h" #include "chrome/browser/managed_mode/managed_user_sync_service_factory.h" -#include "chrome/common/chrome_switches.h" #include "chromeos/network/network_state.h" #include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" @@ -343,10 +341,6 @@ void LocallyManagedUserCreationScreen::OnManagerFullyAuthenticated( last_page_ = kNameOfNewUserParametersScreen; - CommandLine* command_line = CommandLine::ForCurrentProcess(); - if (!command_line->HasSwitch(::switches::kAllowCreateExistingManagedUsers)) - return; - ManagedUserSyncServiceFactory::GetForProfile(manager_profile)-> GetManagedUsersAsync(base::Bind( &LocallyManagedUserCreationScreen::OnGetManagedUsers, diff --git a/chrome/browser/chromeos/login/managed/supervised_user_authentication.cc b/chrome/browser/chromeos/login/managed/supervised_user_authentication.cc index cbfba6f..87478c6 100644 --- a/chrome/browser/chromeos/login/managed/supervised_user_authentication.cc +++ b/chrome/browser/chromeos/login/managed/supervised_user_authentication.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/login/managed/supervised_user_authentication.h" #include "base/base64.h" -#include "base/command_line.h" #include "base/json/json_file_value_serializer.h" #include "base/macros.h" #include "base/metrics/histogram.h" @@ -17,7 +16,6 @@ #include "chrome/browser/chromeos/login/user.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" -#include "chromeos/chromeos_switches.h" #include "chromeos/cryptohome/signed_secret.pb.h" #include "content/public/browser/browser_thread.h" #include "crypto/hmac.h" @@ -137,11 +135,7 @@ void OnPasswordDataLoaded( SupervisedUserAuthentication::SupervisedUserAuthentication( SupervisedUserManager* owner) : owner_(owner), - stable_schema_(SCHEMA_PLAIN) { - CommandLine* command_line = CommandLine::ForCurrentProcess(); - if (command_line->HasSwitch(switches::kEnableSupervisedPasswordSync)) { - stable_schema_ = SCHEMA_SALT_HASHED; - } + stable_schema_(SCHEMA_SALT_HASHED) { } SupervisedUserAuthentication::~SupervisedUserAuthentication() {} diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc index 5b47f24..4942c72 100644 --- a/chromeos/chromeos_switches.cc +++ b/chromeos/chromeos_switches.cc @@ -204,8 +204,5 @@ const char kForceFirstRunUI[] = "force-first-run-ui"; // Enables testing for auto update UI. const char kTestAutoUpdateUI[] = "test-auto-update-ui"; -// Enables features required for supervised user sync, -const char kEnableSupervisedPasswordSync[] = "enable-supervised-password-sync"; - } // namespace switches } // namespace chromeos diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h index 097f9d6..48aee7a 100644 --- a/chromeos/chromeos_switches.h +++ b/chromeos/chromeos_switches.h @@ -73,7 +73,6 @@ CHROMEOS_EXPORT extern const char kEnableFirstRunUITransitions[]; CHROMEOS_EXPORT extern const char kDisableSamlSignin[]; CHROMEOS_EXPORT extern const char kGAIAAuthExtensionManifest[]; CHROMEOS_EXPORT extern const char kTestAutoUpdateUI[]; -CHROMEOS_EXPORT extern const char kEnableSupervisedPasswordSync[]; } // namespace switches } // namespace chromeos |