Chromium Code Reviews| Index: blimp/client/core/settings/settings_feature.cc |
| diff --git a/blimp/client/core/settings/settings_feature.cc b/blimp/client/core/settings/settings_feature.cc |
| index d2e9d1d8b3045c2325b4a98d352ad835002315a9..6262f04771ef2dd31cb7e3120cc104b4e6dddd37 100644 |
| --- a/blimp/client/core/settings/settings_feature.cc |
| +++ b/blimp/client/core/settings/settings_feature.cc |
| @@ -4,6 +4,7 @@ |
| #include "blimp/client/core/settings/settings_feature.h" |
| +#include "blimp/client/core/settings/settings.h" |
| #include "blimp/common/create_blimp_message.h" |
| #include "blimp/common/proto/blimp_message.pb.h" |
| #include "blimp/common/proto/settings.pb.h" |
| @@ -12,7 +13,8 @@ |
| namespace blimp { |
| namespace client { |
| -SettingsFeature::SettingsFeature() : record_whole_document_(false) {} |
| +SettingsFeature::SettingsFeature(Settings* settings) |
| + : settings_(settings) {} |
| SettingsFeature::~SettingsFeature() {} |
|
David Trainor- moved to gerrit
2016/10/07 07:04:59
Does = default work?
Menglin
2016/10/08 00:20:55
yeah! Done.
|
| @@ -21,19 +23,8 @@ void SettingsFeature::set_outgoing_message_processor( |
| outgoing_message_processor_ = std::move(processor); |
| } |
| -void SettingsFeature::SetRecordWholeDocument(bool record_whole_document) { |
| - if (record_whole_document_ == record_whole_document) |
| - return; |
| - |
| - record_whole_document_ = record_whole_document; |
| - |
| - EngineSettingsMessage* engine_settings; |
| - std::unique_ptr<BlimpMessage> message = CreateBlimpMessage(&engine_settings); |
| - engine_settings->set_record_whole_document(record_whole_document_); |
| - outgoing_message_processor_->ProcessMessage(std::move(message), |
| - net::CompletionCallback()); |
| -} |
| - |
| +// TODO(mlliu): remove this method once we set the user agent in PushSettings() |
| +// http://crbug.com/652032. |
| void SettingsFeature::SendUserAgentOSVersionInfo(const std::string& osVersion) { |
| EngineSettingsMessage* engine_settings; |
| std::unique_ptr<BlimpMessage> message = CreateBlimpMessage(&engine_settings); |
| @@ -49,5 +40,16 @@ void SettingsFeature::ProcessMessage(std::unique_ptr<BlimpMessage> message, |
| callback.Run(net::OK); |
| } |
| +void SettingsFeature::PushSettings() { |
| + // TODO(mlliu): set the user agent on the proto as well after moving |
| + // blimp/client/app/user_agent.* to this directory (http://crbug.com/652032). |
| + EngineSettingsMessage* engine_settings; |
| + std::unique_ptr<BlimpMessage> message = CreateBlimpMessage(&engine_settings); |
| + engine_settings->set_record_whole_document( |
| + settings_->record_whole_document()); |
| + outgoing_message_processor_->ProcessMessage(std::move(message), |
| + net::CompletionCallback()); |
| +} |
| + |
| } // namespace client |
| } // namespace blimp |