X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchromeos%2Fdbus%2Fsession_manager_client.cc;h=af81816538b7e45f6b10012be1fb07e7ea6137a6;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=aea543140e331a9e6af0bb8954e45fb9665ca76b;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/chromeos/dbus/session_manager_client.cc b/src/chromeos/dbus/session_manager_client.cc index aea5431..af81816 100644 --- a/src/chromeos/dbus/session_manager_client.cc +++ b/src/chromeos/dbus/session_manager_client.cc @@ -72,29 +72,29 @@ class SessionManagerClientImpl : public SessionManagerClient { } // SessionManagerClient overrides: - virtual void SetStubDelegate(StubDelegate* delegate) OVERRIDE { + virtual void SetStubDelegate(StubDelegate* delegate) override { // Do nothing; this isn't a stub implementation. } - virtual void AddObserver(Observer* observer) OVERRIDE { + virtual void AddObserver(Observer* observer) override { observers_.AddObserver(observer); } - virtual void RemoveObserver(Observer* observer) OVERRIDE { + virtual void RemoveObserver(Observer* observer) override { observers_.RemoveObserver(observer); } - virtual bool HasObserver(Observer* observer) OVERRIDE { + virtual bool HasObserver(Observer* observer) override { return observers_.HasObserver(observer); } - virtual void EmitLoginPromptVisible() OVERRIDE { + virtual void EmitLoginPromptVisible() override { SimpleMethodCallToSessionManager( login_manager::kSessionManagerEmitLoginPromptVisible); FOR_EACH_OBSERVER(Observer, observers_, EmitLoginPromptVisibleCalled()); } - virtual void RestartJob(int pid, const std::string& command_line) OVERRIDE { + virtual void RestartJob(int pid, const std::string& command_line) override { dbus::MethodCall method_call(login_manager::kSessionManagerInterface, login_manager::kSessionManagerRestartJob); dbus::MessageWriter writer(&method_call); @@ -107,7 +107,7 @@ class SessionManagerClientImpl : public SessionManagerClient { weak_ptr_factory_.GetWeakPtr())); } - virtual void StartSession(const std::string& user_email) OVERRIDE { + virtual void StartSession(const std::string& user_email) override { dbus::MethodCall method_call(login_manager::kSessionManagerInterface, login_manager::kSessionManagerStartSession); dbus::MessageWriter writer(&method_call); @@ -120,7 +120,7 @@ class SessionManagerClientImpl : public SessionManagerClient { weak_ptr_factory_.GetWeakPtr())); } - virtual void StopSession() OVERRIDE { + virtual void StopSession() override { dbus::MethodCall method_call(login_manager::kSessionManagerInterface, login_manager::kSessionManagerStopSession); dbus::MessageWriter writer(&method_call); @@ -132,7 +132,7 @@ class SessionManagerClientImpl : public SessionManagerClient { weak_ptr_factory_.GetWeakPtr())); } - virtual void StartDeviceWipe() OVERRIDE { + virtual void StartDeviceWipe() override { dbus::MethodCall method_call(login_manager::kSessionManagerInterface, login_manager::kSessionManagerStartDeviceWipe); session_manager_proxy_->CallMethod( @@ -142,22 +142,32 @@ class SessionManagerClientImpl : public SessionManagerClient { weak_ptr_factory_.GetWeakPtr())); } - virtual void RequestLockScreen() OVERRIDE { + virtual void RequestLockScreen() override { SimpleMethodCallToSessionManager(login_manager::kSessionManagerLockScreen); } - virtual void NotifyLockScreenShown() OVERRIDE { + virtual void NotifyLockScreenShown() override { SimpleMethodCallToSessionManager( login_manager::kSessionManagerHandleLockScreenShown); } - virtual void NotifyLockScreenDismissed() OVERRIDE { + virtual void NotifyLockScreenDismissed() override { SimpleMethodCallToSessionManager( login_manager::kSessionManagerHandleLockScreenDismissed); } + virtual void NotifySupervisedUserCreationStarted() override { + SimpleMethodCallToSessionManager( + login_manager::kSessionManagerHandleSupervisedUserCreationStarting); + } + + virtual void NotifySupervisedUserCreationFinished() override { + SimpleMethodCallToSessionManager( + login_manager::kSessionManagerHandleSupervisedUserCreationFinished); + } + virtual void RetrieveActiveSessions( - const ActiveSessionsCallback& callback) OVERRIDE { + const ActiveSessionsCallback& callback) override { dbus::MethodCall method_call( login_manager::kSessionManagerInterface, login_manager::kSessionManagerRetrieveActiveSessions); @@ -172,7 +182,7 @@ class SessionManagerClientImpl : public SessionManagerClient { } virtual void RetrieveDevicePolicy( - const RetrievePolicyCallback& callback) OVERRIDE { + const RetrievePolicyCallback& callback) override { dbus::MethodCall method_call(login_manager::kSessionManagerInterface, login_manager::kSessionManagerRetrievePolicy); session_manager_proxy_->CallMethod( @@ -186,7 +196,7 @@ class SessionManagerClientImpl : public SessionManagerClient { virtual void RetrievePolicyForUser( const std::string& username, - const RetrievePolicyCallback& callback) OVERRIDE { + const RetrievePolicyCallback& callback) override { CallRetrievePolicyByUsername( login_manager::kSessionManagerRetrievePolicyForUser, username, @@ -194,7 +204,7 @@ class SessionManagerClientImpl : public SessionManagerClient { } virtual std::string BlockingRetrievePolicyForUser( - const std::string& username) OVERRIDE { + const std::string& username) override { dbus::MethodCall method_call( login_manager::kSessionManagerInterface, login_manager::kSessionManagerRetrievePolicyForUser); @@ -211,7 +221,7 @@ class SessionManagerClientImpl : public SessionManagerClient { virtual void RetrieveDeviceLocalAccountPolicy( const std::string& account_name, - const RetrievePolicyCallback& callback) OVERRIDE { + const RetrievePolicyCallback& callback) override { CallRetrievePolicyByUsername( login_manager::kSessionManagerRetrieveDeviceLocalAccountPolicy, account_name, @@ -219,7 +229,7 @@ class SessionManagerClientImpl : public SessionManagerClient { } virtual void StoreDevicePolicy(const std::string& policy_blob, - const StorePolicyCallback& callback) OVERRIDE { + const StorePolicyCallback& callback) override { dbus::MethodCall method_call(login_manager::kSessionManagerInterface, login_manager::kSessionManagerStorePolicy); dbus::MessageWriter writer(&method_call); @@ -238,7 +248,7 @@ class SessionManagerClientImpl : public SessionManagerClient { virtual void StorePolicyForUser( const std::string& username, const std::string& policy_blob, - const StorePolicyCallback& callback) OVERRIDE { + const StorePolicyCallback& callback) override { CallStorePolicyByUsername(login_manager::kSessionManagerStorePolicyForUser, username, policy_blob, @@ -248,7 +258,7 @@ class SessionManagerClientImpl : public SessionManagerClient { virtual void StoreDeviceLocalAccountPolicy( const std::string& account_name, const std::string& policy_blob, - const StorePolicyCallback& callback) OVERRIDE { + const StorePolicyCallback& callback) override { CallStorePolicyByUsername( login_manager::kSessionManagerStoreDeviceLocalAccountPolicy, account_name, @@ -257,7 +267,7 @@ class SessionManagerClientImpl : public SessionManagerClient { } virtual void SetFlagsForUser(const std::string& username, - const std::vector& flags) OVERRIDE { + const std::vector& flags) override { dbus::MethodCall method_call(login_manager::kSessionManagerInterface, login_manager::kSessionManagerSetFlagsForUser); dbus::MessageWriter writer(&method_call); @@ -270,7 +280,7 @@ class SessionManagerClientImpl : public SessionManagerClient { } virtual void GetServerBackedStateKeys(const StateKeysCallback& callback) - OVERRIDE { + override { dbus::MethodCall method_call( login_manager::kSessionManagerInterface, login_manager::kSessionManagerGetServerBackedStateKeys); @@ -284,7 +294,7 @@ class SessionManagerClientImpl : public SessionManagerClient { } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { session_manager_proxy_ = bus->GetObjectProxy( login_manager::kSessionManagerServiceName, dbus::ObjectPath(login_manager::kSessionManagerServicePath)); @@ -525,7 +535,6 @@ class SessionManagerClientImpl : public SessionManagerClient { void OnGetServerBackedStateKeys(const StateKeysCallback& callback, dbus::Response* response) { std::vector state_keys; - bool first_run = false; if (!response) { LOG(ERROR) << "Failed to call " << login_manager::kSessionManagerStartSession; @@ -548,14 +557,10 @@ class SessionManagerClientImpl : public SessionManagerClient { std::string(reinterpret_cast(data), size)); } } - if (!reader.PopBool(&first_run)) { - // TODO(tnagel): After 2014-11-19 turn this warning into an error. - LOG(WARNING) << "Chrome OS is too old. Defaulting to first_run=false."; - } } if (!callback.is_null()) - callback.Run(state_keys, first_run); + callback.Run(state_keys); } @@ -578,38 +583,40 @@ class SessionManagerClientStubImpl : public SessionManagerClient { virtual ~SessionManagerClientStubImpl() {} // SessionManagerClient overrides - virtual void Init(dbus::Bus* bus) OVERRIDE {} - virtual void SetStubDelegate(StubDelegate* delegate) OVERRIDE { + virtual void Init(dbus::Bus* bus) override {} + virtual void SetStubDelegate(StubDelegate* delegate) override { delegate_ = delegate; } - virtual void AddObserver(Observer* observer) OVERRIDE { + virtual void AddObserver(Observer* observer) override { observers_.AddObserver(observer); } - virtual void RemoveObserver(Observer* observer) OVERRIDE { + virtual void RemoveObserver(Observer* observer) override { observers_.RemoveObserver(observer); } - virtual bool HasObserver(Observer* observer) OVERRIDE { + virtual bool HasObserver(Observer* observer) override { return observers_.HasObserver(observer); } - virtual void EmitLoginPromptVisible() OVERRIDE {} - virtual void RestartJob(int pid, const std::string& command_line) OVERRIDE {} - virtual void StartSession(const std::string& user_email) OVERRIDE {} - virtual void StopSession() OVERRIDE {} - virtual void StartDeviceWipe() OVERRIDE {} - virtual void RequestLockScreen() OVERRIDE { + virtual void EmitLoginPromptVisible() override {} + virtual void RestartJob(int pid, const std::string& command_line) override {} + virtual void StartSession(const std::string& user_email) override {} + virtual void StopSession() override {} + virtual void NotifySupervisedUserCreationStarted() override {} + virtual void NotifySupervisedUserCreationFinished() override {} + virtual void StartDeviceWipe() override {} + virtual void RequestLockScreen() override { if (delegate_) delegate_->LockScreenForStub(); } - virtual void NotifyLockScreenShown() OVERRIDE { + virtual void NotifyLockScreenShown() override { FOR_EACH_OBSERVER(Observer, observers_, ScreenIsLocked()); } - virtual void NotifyLockScreenDismissed() OVERRIDE { + virtual void NotifyLockScreenDismissed() override { FOR_EACH_OBSERVER(Observer, observers_, ScreenIsUnlocked()); } virtual void RetrieveActiveSessions( - const ActiveSessionsCallback& callback) OVERRIDE {} + const ActiveSessionsCallback& callback) override {} virtual void RetrieveDevicePolicy( - const RetrievePolicyCallback& callback) OVERRIDE { + const RetrievePolicyCallback& callback) override { base::FilePath owner_key_path; if (!PathService::Get(chromeos::FILE_OWNER_KEY, &owner_key_path)) { callback.Run(""); @@ -625,7 +632,7 @@ class SessionManagerClientStubImpl : public SessionManagerClient { } virtual void RetrievePolicyForUser( const std::string& username, - const RetrievePolicyCallback& callback) OVERRIDE { + const RetrievePolicyCallback& callback) override { base::PostTaskAndReplyWithResult( base::WorkerPool::GetTaskRunner(false).get(), FROM_HERE, @@ -633,16 +640,16 @@ class SessionManagerClientStubImpl : public SessionManagerClient { callback); } virtual std::string BlockingRetrievePolicyForUser( - const std::string& username) OVERRIDE { + const std::string& username) override { return GetFileContent(GetUserFilePath(username, "stub_policy")); } virtual void RetrieveDeviceLocalAccountPolicy( const std::string& account_name, - const RetrievePolicyCallback& callback) OVERRIDE { + const RetrievePolicyCallback& callback) override { RetrievePolicyForUser(account_name, callback); } virtual void StoreDevicePolicy(const std::string& policy_blob, - const StorePolicyCallback& callback) OVERRIDE { + const StorePolicyCallback& callback) override { enterprise_management::PolicyFetchResponse response; base::FilePath owner_key_path; if (!response.ParseFromString(policy_blob) || @@ -674,7 +681,7 @@ class SessionManagerClientStubImpl : public SessionManagerClient { virtual void StorePolicyForUser( const std::string& username, const std::string& policy_blob, - const StorePolicyCallback& callback) OVERRIDE { + const StorePolicyCallback& callback) override { // The session manager writes the user policy key to a well-known // location. Do the same with the stub impl, so that user policy works and // can be tested on desktop builds. @@ -704,21 +711,21 @@ class SessionManagerClientStubImpl : public SessionManagerClient { virtual void StoreDeviceLocalAccountPolicy( const std::string& account_name, const std::string& policy_blob, - const StorePolicyCallback& callback) OVERRIDE { + const StorePolicyCallback& callback) override { StorePolicyForUser(account_name, policy_blob, callback); } virtual void SetFlagsForUser(const std::string& username, - const std::vector& flags) OVERRIDE { + const std::vector& flags) override { } virtual void GetServerBackedStateKeys(const StateKeysCallback& callback) - OVERRIDE { + override { std::vector state_keys; for (int i = 0; i < 5; ++i) state_keys.push_back(crypto::SHA256HashString(base::IntToString(i))); if (!callback.is_null()) - callback.Run(state_keys, false); + callback.Run(state_keys); } private: