Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Side by Side Diff: components/signin/ios/browser/profile_oauth2_token_service_ios.h

Issue 1094103005: Profile chooser on mac was passing wrong value to signin error controller. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef COMPONENTS_SIGNIN_IOS_BROWSER_PROFILE_OAUTH2_TOKEN_SERVICE_IOS_H_ 5 #ifndef COMPONENTS_SIGNIN_IOS_BROWSER_PROFILE_OAUTH2_TOKEN_SERVICE_IOS_H_
6 #define COMPONENTS_SIGNIN_IOS_BROWSER_PROFILE_OAUTH2_TOKEN_SERVICE_IOS_H_ 6 #define COMPONENTS_SIGNIN_IOS_BROWSER_PROFILE_OAUTH2_TOKEN_SERVICE_IOS_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/threading/thread_checker.h" 10 #include "base/threading/thread_checker.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 class AccountInfo : public SigninErrorController::AuthStatusProvider { 107 class AccountInfo : public SigninErrorController::AuthStatusProvider {
108 public: 108 public:
109 AccountInfo(SigninErrorController* signin_error_controller, 109 AccountInfo(SigninErrorController* signin_error_controller,
110 const std::string& account_id); 110 const std::string& account_id);
111 ~AccountInfo() override; 111 ~AccountInfo() override;
112 112
113 void SetLastAuthError(const GoogleServiceAuthError& error); 113 void SetLastAuthError(const GoogleServiceAuthError& error);
114 114
115 // SigninErrorController::AuthStatusProvider implementation. 115 // SigninErrorController::AuthStatusProvider implementation.
116 std::string GetAccountId() const override; 116 std::string GetAccountId() const override;
117 std::string GetUsername() const override;
118 GoogleServiceAuthError GetAuthStatus() const override; 117 GoogleServiceAuthError GetAuthStatus() const override;
119 118
120 bool marked_for_removal() const { return marked_for_removal_; } 119 bool marked_for_removal() const { return marked_for_removal_; }
121 void set_marked_for_removal(bool marked_for_removal) { 120 void set_marked_for_removal(bool marked_for_removal) {
122 marked_for_removal_ = marked_for_removal; 121 marked_for_removal_ = marked_for_removal;
123 } 122 }
124 123
125 private: 124 private:
126 SigninErrorController* signin_error_controller_; 125 SigninErrorController* signin_error_controller_;
127 std::string account_id_; 126 std::string account_id_;
(...skipping 27 matching lines...) Expand all
155 154
156 // Calls to this class are expected to be made from the browser UI thread. 155 // Calls to this class are expected to be made from the browser UI thread.
157 // The purpose of this checker is to detect access to 156 // The purpose of this checker is to detect access to
158 // ProfileOAuth2TokenService from multiple threads in upstream code. 157 // ProfileOAuth2TokenService from multiple threads in upstream code.
159 base::ThreadChecker thread_checker_; 158 base::ThreadChecker thread_checker_;
160 159
161 DISALLOW_COPY_AND_ASSIGN(ProfileOAuth2TokenServiceIOS); 160 DISALLOW_COPY_AND_ASSIGN(ProfileOAuth2TokenServiceIOS);
162 }; 161 };
163 162
164 #endif // COMPONENTS_SIGNIN_IOS_BROWSER_PROFILE_OAUTH2_TOKEN_SERVICE_IOS_H_ 163 #endif // COMPONENTS_SIGNIN_IOS_BROWSER_PROFILE_OAUTH2_TOKEN_SERVICE_IOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698