Index: blimp/engine/app/blimp_browser_main_parts.cc |
diff --git a/blimp/engine/app/blimp_browser_main_parts.cc b/blimp/engine/app/blimp_browser_main_parts.cc |
index 66ce080f76a9226084c645a3ada3a9316d4ad225..dc21560cb1eab7f1a11527650484ad0e3af3b76c 100644 |
--- a/blimp/engine/app/blimp_browser_main_parts.cc |
+++ b/blimp/engine/app/blimp_browser_main_parts.cc |
@@ -8,6 +8,7 @@ |
#include "base/threading/thread_restrictions.h" |
#include "blimp/common/proto/blimp_message.pb.h" |
#include "blimp/engine/app/blimp_engine_config.h" |
+#include "blimp/engine/app/settings_manager.h" |
#include "blimp/engine/common/blimp_browser_context.h" |
#include "blimp/engine/session/blimp_engine_session.h" |
#include "blimp/net/blimp_connection.h" |
@@ -38,10 +39,12 @@ void BlimpBrowserMainParts::PreEarlyInitialization() { |
void BlimpBrowserMainParts::PreMainMessageLoopRun() { |
net_log_.reset(new net::NetLog()); |
+ settings_manager_.reset(new SettingsManager); |
scoped_ptr<BlimpBrowserContext> browser_context( |
new BlimpBrowserContext(false, net_log_.get())); |
- engine_session_.reset(new BlimpEngineSession( |
- std::move(browser_context), net_log_.get(), engine_config_.get())); |
+ engine_session_.reset( |
+ new BlimpEngineSession(std::move(browser_context), net_log_.get(), |
+ engine_config_.get(), settings_manager_.get())); |
engine_session_->Initialize(); |
} |
@@ -53,5 +56,9 @@ BlimpBrowserContext* BlimpBrowserMainParts::GetBrowserContext() { |
return engine_session_->browser_context(); |
} |
+SettingsManager* BlimpBrowserMainParts::GetSettingsManager() { |
+ return settings_manager_.get(); |
+} |
+ |
} // namespace engine |
} // namespace blimp |