Commit 5e9f4e66 authored by Mattias Nissler's avatar Mattias Nissler Committed by Chromium LUCI CQ

Wire up session_manager's SetFeatureFlagsForUser.

This is the usual boilerplate in SessionManagerClient and friends to
expose the new function.

BUG=chromium:1073940
TEST=None

Change-Id: Id9144ac921d8ab5f26f0874da9476838a3ebef5b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2560271
Commit-Queue: Mattias Nissler <mnissler@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#840313}
parent da1ac56f
...@@ -591,6 +591,10 @@ void FakeSessionManagerClient::SetFlagsForUser( ...@@ -591,6 +591,10 @@ void FakeSessionManagerClient::SetFlagsForUser(
flags_for_user_[cryptohome_id] = flags; flags_for_user_[cryptohome_id] = flags;
} }
void FakeSessionManagerClient::SetFeatureFlagsForUser(
const cryptohome::AccountIdentifier& cryptohome_id,
const std::vector<std::string>& feature_flags) {}
void FakeSessionManagerClient::GetServerBackedStateKeys( void FakeSessionManagerClient::GetServerBackedStateKeys(
StateKeysCallback callback) { StateKeysCallback callback) {
if (force_state_keys_missing_) { if (force_state_keys_missing_) {
......
...@@ -117,6 +117,9 @@ class COMPONENT_EXPORT(SESSION_MANAGER) FakeSessionManagerClient ...@@ -117,6 +117,9 @@ class COMPONENT_EXPORT(SESSION_MANAGER) FakeSessionManagerClient
bool SupportsBrowserRestart() const override; bool SupportsBrowserRestart() const override;
void SetFlagsForUser(const cryptohome::AccountIdentifier& cryptohome_id, void SetFlagsForUser(const cryptohome::AccountIdentifier& cryptohome_id,
const std::vector<std::string>& flags) override; const std::vector<std::string>& flags) override;
void SetFeatureFlagsForUser(
const cryptohome::AccountIdentifier& cryptohome_id,
const std::vector<std::string>& feature_flags) override;
void GetServerBackedStateKeys(StateKeysCallback callback) override; void GetServerBackedStateKeys(StateKeysCallback callback) override;
void StartArcMiniContainer( void StartArcMiniContainer(
......
...@@ -517,6 +517,20 @@ class SessionManagerClientImpl : public SessionManagerClient { ...@@ -517,6 +517,20 @@ class SessionManagerClientImpl : public SessionManagerClient {
base::DoNothing()); base::DoNothing());
} }
void SetFeatureFlagsForUser(
const cryptohome::AccountIdentifier& cryptohome_id,
const std::vector<std::string>& feature_flags) override {
dbus::MethodCall method_call(
login_manager::kSessionManagerInterface,
login_manager::kSessionManagerSetFeatureFlagsForUser);
dbus::MessageWriter writer(&method_call);
writer.AppendString(cryptohome_id.account_id());
writer.AppendArrayOfStrings(feature_flags);
session_manager_proxy_->CallMethod(&method_call,
dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
base::DoNothing());
}
void GetServerBackedStateKeys(StateKeysCallback callback) override { void GetServerBackedStateKeys(StateKeysCallback callback) override {
dbus::MethodCall method_call( dbus::MethodCall method_call(
login_manager::kSessionManagerInterface, login_manager::kSessionManagerInterface,
......
...@@ -372,6 +372,12 @@ class COMPONENT_EXPORT(SESSION_MANAGER) SessionManagerClient { ...@@ -372,6 +372,12 @@ class COMPONENT_EXPORT(SESSION_MANAGER) SessionManagerClient {
const cryptohome::AccountIdentifier& cryptohome_id, const cryptohome::AccountIdentifier& cryptohome_id,
const std::vector<std::string>& flags) = 0; const std::vector<std::string>& flags) = 0;
// Sets feature flags to pass next time Chrome gets restarted by the session
// manager.
virtual void SetFeatureFlagsForUser(
const cryptohome::AccountIdentifier& cryptohome_id,
const std::vector<std::string>& feature_flags) = 0;
using StateKeysCallback = using StateKeysCallback =
base::OnceCallback<void(const std::vector<std::string>& state_keys)>; base::OnceCallback<void(const std::vector<std::string>& state_keys)>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment