diff options
| -rw-r--r-- | chrome/browser/chromeos/cros/login_library.cc | 11 | ||||
| -rw-r--r-- | chrome/browser/chromeos/cros/login_library.h | 5 | ||||
| -rw-r--r-- | chrome/browser/chromeos/cros/mock_login_library.h | 1 |
3 files changed, 15 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/cros/login_library.cc b/chrome/browser/chromeos/cros/login_library.cc index ddd81f2..49410da 100644 --- a/chrome/browser/chromeos/cros/login_library.cc +++ b/chrome/browser/chromeos/cros/login_library.cc @@ -80,6 +80,10 @@ class LoginLibraryImpl : public LoginLibrary { return chromeos::Whitelist(email.c_str(), signature); } + bool EnumerateWhitelisted(std::vector<std::string>* whitelisted) { + return chromeos::EnumerateWhitelisted(whitelisted); + } + bool StartSession(const std::string& user_email, const std::string& unique_id /* unused */) { // only pass unique_id through once we use it for something. @@ -198,13 +202,16 @@ class LoginLibraryStubImpl : public LoginLibrary { return true; } bool WhitelistAsync(const std::string& email, - const std::vector<uint8>& signature, - Delegate<bool>* callback) { + const std::vector<uint8>& signature, + Delegate<bool>* callback) { ChromeThread::PostTask( ChromeThread::UI, FROM_HERE, NewRunnableFunction(&DoStubCallback, callback)); return true; } + bool EnumerateWhitelisted(std::vector<std::string>* whitelisted) { + return true; + } bool StartSession(const std::string& user_email, const std::string& unique_id /* unused */) { return true; } bool StopSession(const std::string& unique_id /* unused */) { return true; } diff --git a/chrome/browser/chromeos/cros/login_library.h b/chrome/browser/chromeos/cros/login_library.h index 7b6e998..4905f9e 100644 --- a/chrome/browser/chromeos/cros/login_library.h +++ b/chrome/browser/chromeos/cros/login_library.h @@ -78,6 +78,11 @@ class LoginLibrary { const std::vector<uint8>& signature, Delegate<bool>* callback) = 0; + // Retrieves the user white list. Note the call is for display purpose only. + // To determine if an email is white listed, you MUST use CheckWhitelist. + // Returns true if the request is successfully dispatched. + virtual bool EnumerateWhitelisted(std::vector<std::string>* whitelisted) = 0; + // Tells the session manager to start a logged-in session for the user // |user_email|. |unique_id| is meant to be used when we have a non-human- // readable unique identifier by which we distinguish users (to deal with diff --git a/chrome/browser/chromeos/cros/mock_login_library.h b/chrome/browser/chromeos/cros/mock_login_library.h index d09c971..b935a11 100644 --- a/chrome/browser/chromeos/cros/mock_login_library.h +++ b/chrome/browser/chromeos/cros/mock_login_library.h @@ -34,6 +34,7 @@ class MockLoginLibrary : public LoginLibrary { MOCK_METHOD3(WhitelistAsync, bool(const std::string&, const std::vector<uint8>&, Delegate<bool>*)); + MOCK_METHOD1(EnumerateWhitelisted, bool(std::vector<std::string>*)); MOCK_METHOD2(StartSession, bool(const std::string&, const std::string&)); MOCK_METHOD1(StopSession, bool(const std::string&)); MOCK_METHOD2(RestartJob, bool(int, const std::string&)); |