| Index: blimp/engine/feature/engine_render_widget_feature.h
|
| diff --git a/blimp/engine/feature/engine_render_widget_feature.h b/blimp/engine/feature/engine_render_widget_feature.h
|
| index 155ad3e538a95ed1fbe1e10edaa8d232c94f833c..a7f48297492bed836b5e26b0f64cc6546f159255 100644
|
| --- a/blimp/engine/feature/engine_render_widget_feature.h
|
| +++ b/blimp/engine/feature/engine_render_widget_feature.h
|
| @@ -14,6 +14,7 @@
|
| #include "base/containers/small_map.h"
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "blimp/engine/feature/engine_settings_feature.h"
|
| #include "blimp/net/blimp_message_processor.h"
|
| #include "blimp/net/input_message_converter.h"
|
|
|
| @@ -33,7 +34,8 @@ namespace blimp {
|
| // notified of incoming messages. This class automatically handles dropping
|
| // stale BlimpMessage::RENDER_WIDGET messages from the client after a
|
| // RenderWidgetMessage::INITIALIZE message is sent.
|
| -class EngineRenderWidgetFeature : public BlimpMessageProcessor {
|
| +class EngineRenderWidgetFeature : public BlimpMessageProcessor,
|
| + public EngineSettingsFeature::Observer {
|
| public:
|
| // A delegate to be notified of specific RenderWidget related incoming events.
|
| class RenderWidgetMessageDelegate {
|
| @@ -51,7 +53,7 @@ class EngineRenderWidgetFeature : public BlimpMessageProcessor {
|
| const std::vector<uint8_t>& message) = 0;
|
| };
|
|
|
| - EngineRenderWidgetFeature();
|
| + explicit EngineRenderWidgetFeature(EngineSettingsFeature* settings);
|
| ~EngineRenderWidgetFeature() override;
|
|
|
| void set_render_widget_message_sender(
|
| @@ -98,6 +100,9 @@ class EngineRenderWidgetFeature : public BlimpMessageProcessor {
|
| void ProcessMessage(scoped_ptr<BlimpMessage> message,
|
| const net::CompletionCallback& callback) override;
|
|
|
| + // EngineSettingsFeature::Observer implementation.
|
| + void OnWebPreferencesChanged() override;
|
| +
|
| private:
|
| typedef base::SmallMap<std::map<int, RenderWidgetMessageDelegate*> >
|
| DelegateMap;
|
| @@ -151,6 +156,8 @@ class EngineRenderWidgetFeature : public BlimpMessageProcessor {
|
|
|
| InputMessageConverter input_message_converter_;
|
|
|
| + EngineSettingsFeature* settings_feature_;
|
| +
|
| // Outgoing message processors for RENDER_WIDGET, COMPOSITOR and INPUT types.
|
| scoped_ptr<BlimpMessageProcessor> render_widget_message_sender_;
|
| scoped_ptr<BlimpMessageProcessor> compositor_message_sender_;
|
|
|