| Index: chrome/browser/chromeos/login/signed_settings_helper.cc
|
| diff --git a/chrome/browser/chromeos/login/signed_settings_helper.cc b/chrome/browser/chromeos/login/signed_settings_helper.cc
|
| index e5ea6fb990e50767bc0527d75d19a0365ab8b6e9..e61cdb181db1048303838a131865e3febc474f86 100644
|
| --- a/chrome/browser/chromeos/login/signed_settings_helper.cc
|
| +++ b/chrome/browser/chromeos/login/signed_settings_helper.cc
|
| @@ -101,72 +101,6 @@ class OpContext {
|
| SignedSettingsHelper::Callback* callback_;
|
| };
|
|
|
| -class WhitelistOpContext : public SignedSettings::Delegate<bool>,
|
| - public OpContext {
|
| - public:
|
| - enum Type {
|
| - CHECK,
|
| - ADD,
|
| - REMOVE,
|
| - };
|
| -
|
| - WhitelistOpContext(Type type,
|
| - const std::string& email,
|
| - SignedSettingsHelper::Callback* callback,
|
| - OpContext::Delegate* delegate)
|
| - : OpContext(callback, delegate),
|
| - type_(type),
|
| - email_(email) {
|
| - }
|
| -
|
| - // chromeos::SignedSettings::Delegate implementation
|
| - virtual void OnSettingsOpCompleted(SignedSettings::ReturnCode code,
|
| - bool value) OVERRIDE {
|
| - if (callback_) {
|
| - switch (type_) {
|
| - case CHECK:
|
| - callback_->OnCheckWhitelistCompleted(code, email_);
|
| - break;
|
| - case ADD:
|
| - callback_->OnWhitelistCompleted(code, email_);
|
| - break;
|
| - case REMOVE:
|
| - callback_->OnUnwhitelistCompleted(code, email_);
|
| - break;
|
| - default:
|
| - LOG(ERROR) << "Unknown WhitelistOpContext type " << type_;
|
| - break;
|
| - }
|
| - }
|
| - OnOpCompleted();
|
| - }
|
| -
|
| - protected:
|
| - // OpContext implemenetation
|
| - virtual void CreateOp() OVERRIDE {
|
| - switch (type_) {
|
| - case CHECK:
|
| - op_ = SignedSettings::CreateCheckWhitelistOp(email_, this);
|
| - break;
|
| - case ADD:
|
| - op_ = SignedSettings::CreateWhitelistOp(email_, true, this);
|
| - break;
|
| - case REMOVE:
|
| - op_ = SignedSettings::CreateWhitelistOp(email_, false, this);
|
| - break;
|
| - default:
|
| - LOG(ERROR) << "Unknown WhitelistOpContext type " << type_;
|
| - break;
|
| - }
|
| - }
|
| -
|
| - private:
|
| - Type type_;
|
| - std::string email_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(WhitelistOpContext);
|
| -};
|
| -
|
| class StorePropertyOpContext : public SignedSettings::Delegate<bool>,
|
| public OpContext {
|
| public:
|
| @@ -298,11 +232,6 @@ class SignedSettingsHelperImpl : public SignedSettingsHelper,
|
| public OpContext::Delegate {
|
| public:
|
| // SignedSettingsHelper implementation
|
| - virtual void StartCheckWhitelistOp(const std::string& email,
|
| - Callback* callback) OVERRIDE;
|
| - virtual void StartWhitelistOp(const std::string& email,
|
| - bool add_to_whitelist,
|
| - Callback* callback) OVERRIDE;
|
| virtual void StartStorePropertyOp(const std::string& name,
|
| const base::Value& value,
|
| Callback* callback) OVERRIDE;
|
| @@ -345,27 +274,6 @@ SignedSettingsHelperImpl::~SignedSettingsHelperImpl() {
|
| }
|
| }
|
|
|
| -void SignedSettingsHelperImpl::StartCheckWhitelistOp(
|
| - const std::string&email,
|
| - SignedSettingsHelper::Callback* callback) {
|
| - AddOpContext(new WhitelistOpContext(
|
| - WhitelistOpContext::CHECK,
|
| - email,
|
| - callback,
|
| - this));
|
| -}
|
| -
|
| -void SignedSettingsHelperImpl::StartWhitelistOp(
|
| - const std::string&email,
|
| - bool add_to_whitelist,
|
| - SignedSettingsHelper::Callback* callback) {
|
| - AddOpContext(new WhitelistOpContext(
|
| - add_to_whitelist ? WhitelistOpContext::ADD : WhitelistOpContext::REMOVE,
|
| - email,
|
| - callback,
|
| - this));
|
| -}
|
| -
|
| void SignedSettingsHelperImpl::StartStorePropertyOp(
|
| const std::string& name,
|
| const base::Value& value,
|
|
|