diff options
author | vmpstr <vmpstr@chromium.org> | 2015-11-02 13:59:24 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-02 22:00:03 +0000 |
commit | aed91af90e46a0c501030ab60707dd88688bc24f (patch) | |
tree | e26e7f3946937d21cc26762a908e442d289b6cb7 /components/signin | |
parent | 913b222888f458024440c73b712c2b6ec3de27be (diff) | |
download | chromium_src-aed91af90e46a0c501030ab60707dd88688bc24f.zip chromium_src-aed91af90e46a0c501030ab60707dd88688bc24f.tar.gz chromium_src-aed91af90e46a0c501030ab60707dd88688bc24f.tar.bz2 |
Remove std::bind1st uses.
This patch removes std::bind1st uses, since this is one of the functions
that was deprecated in c++11.
TBR=bsalomon
Review URL: https://codereview.chromium.org/1421003005
Cr-Commit-Position: refs/heads/master@{#357441}
Diffstat (limited to 'components/signin')
-rw-r--r-- | components/signin/core/browser/account_reconcilor.cc | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/components/signin/core/browser/account_reconcilor.cc b/components/signin/core/browser/account_reconcilor.cc index 730189c..51bcd3b 100644 --- a/components/signin/core/browser/account_reconcilor.cc +++ b/components/signin/core/browser/account_reconcilor.cc @@ -23,16 +23,17 @@ namespace { -class AccountEqualToFunc : public std::equal_to<gaia::ListedAccount> { +class AccountEqualToFunc { public: - bool operator()(const gaia::ListedAccount& p1, - const gaia::ListedAccount& p2) const; + AccountEqualToFunc(const gaia::ListedAccount& account) : account_(account) {} + bool operator()(const gaia::ListedAccount& other) const; + + private: + gaia::ListedAccount account_; }; -bool AccountEqualToFunc::operator()( - const gaia::ListedAccount& p1, - const gaia::ListedAccount& p2) const { - return p1.valid == p2.valid && p1.id == p2.id; +bool AccountEqualToFunc::operator()(const gaia::ListedAccount& other) const { + return account_.valid == other.valid && account_.id == other.id; } gaia::ListedAccount AccountForId(const std::string& account_id) { @@ -405,20 +406,17 @@ void AccountReconcilor::FinishReconcile() { int added_to_cookie = 0; for (size_t i = 0; i < add_to_cookie_copy.size(); ++i) { if (gaia_accounts_.end() != - std::find_if(gaia_accounts_.begin(), - gaia_accounts_.end(), - std::bind1st(AccountEqualToFunc(), - AccountForId(add_to_cookie_copy[i])))) { + std::find_if(gaia_accounts_.begin(), gaia_accounts_.end(), + AccountEqualToFunc(AccountForId(add_to_cookie_copy[i])))) { cookie_manager_service_->SignalComplete( add_to_cookie_copy[i], GoogleServiceAuthError::AuthErrorNone()); } else { PerformMergeAction(add_to_cookie_copy[i]); if (original_gaia_accounts.end() == - std::find_if(original_gaia_accounts.begin(), - original_gaia_accounts.end(), - std::bind1st(AccountEqualToFunc(), - AccountForId(add_to_cookie_copy[i])))) { + std::find_if( + original_gaia_accounts.begin(), original_gaia_accounts.end(), + AccountEqualToFunc(AccountForId(add_to_cookie_copy[i])))) { added_to_cookie++; } } |