| Index: blimp/engine/session/blimp_engine_session.h
|
| diff --git a/blimp/engine/session/blimp_engine_session.h b/blimp/engine/session/blimp_engine_session.h
|
| index 1b311abe8fde1e2dbb9493f2ad69eb33693b1d7e..3b437f6c7e49b4608863c3da64847bf4a05e8d1a 100644
|
| --- a/blimp/engine/session/blimp_engine_session.h
|
| +++ b/blimp/engine/session/blimp_engine_session.h
|
| @@ -13,6 +13,7 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "blimp/common/proto/blimp_message.pb.h"
|
| #include "blimp/engine/feature/engine_render_widget_feature.h"
|
| +#include "blimp/engine/feature/engine_settings_feature.h"
|
| #include "blimp/net/blimp_message_processor.h"
|
| #include "blimp/net/connection_error_observer.h"
|
| #include "content/public/browser/invalidate_type.h"
|
| @@ -55,6 +56,7 @@ class BlimpConnection;
|
| class BlimpMessage;
|
| class BlimpMessageThreadPipe;
|
| class ThreadPipeManager;
|
| +class SettingsManager;
|
|
|
| namespace engine {
|
|
|
| @@ -74,7 +76,8 @@ class BlimpEngineSession
|
| public:
|
| BlimpEngineSession(scoped_ptr<BlimpBrowserContext> browser_context,
|
| net::NetLog* net_log,
|
| - BlimpEngineConfig* config);
|
| + BlimpEngineConfig* config,
|
| + SettingsManager* settings_manager);
|
| ~BlimpEngineSession() override;
|
|
|
| // Starts the network stack on the IO thread, and sets default placeholder
|
| @@ -185,6 +188,12 @@ class BlimpEngineSession
|
| // Only one web_contents is supported for blimp 0.5
|
| scoped_ptr<content::WebContents> web_contents_;
|
|
|
| + // Manages all global settings for the engine session.
|
| + SettingsManager* settings_manager_;
|
| +
|
| + // Handles all incoming messages for type SETTINGS.
|
| + EngineSettingsFeature settings_feature_;
|
| +
|
| // Handles all incoming and outgoing messages related to RenderWidget,
|
| // including INPUT, COMPOSITOR and RENDER_WIDGET messages.
|
| EngineRenderWidgetFeature render_widget_feature_;
|
|
|