| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "blimp/engine/app/blimp_browser_main_parts.h" | 5 #include "blimp/engine/app/blimp_browser_main_parts.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/threading/thread_restrictions.h" | 8 #include "base/threading/thread_restrictions.h" |
| 9 #include "blimp/common/proto/blimp_message.pb.h" | 9 #include "blimp/common/proto/blimp_message.pb.h" |
| 10 #include "blimp/engine/app/blimp_engine_config.h" | 10 #include "blimp/engine/app/blimp_engine_config.h" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 settings_manager_.reset(new SettingsManager); | 42 settings_manager_.reset(new SettingsManager); |
| 43 std::unique_ptr<BlimpBrowserContext> browser_context( | 43 std::unique_ptr<BlimpBrowserContext> browser_context( |
| 44 new BlimpBrowserContext(false, net_log_.get())); | 44 new BlimpBrowserContext(false, net_log_.get())); |
| 45 engine_session_.reset( | 45 engine_session_.reset( |
| 46 new BlimpEngineSession(std::move(browser_context), net_log_.get(), | 46 new BlimpEngineSession(std::move(browser_context), net_log_.get(), |
| 47 engine_config_.get(), settings_manager_.get())); | 47 engine_config_.get(), settings_manager_.get())); |
| 48 engine_session_->Initialize(); | 48 engine_session_->Initialize(); |
| 49 } | 49 } |
| 50 | 50 |
| 51 void BlimpBrowserMainParts::PostMainMessageLoopRun() { | 51 void BlimpBrowserMainParts::PostMainMessageLoopRun() { |
| 52 engine_session_->Finalize(); |
| 52 engine_session_.reset(); | 53 engine_session_.reset(); |
| 53 } | 54 } |
| 54 | 55 |
| 55 BlimpBrowserContext* BlimpBrowserMainParts::GetBrowserContext() { | 56 BlimpBrowserContext* BlimpBrowserMainParts::GetBrowserContext() { |
| 56 return engine_session_->browser_context(); | 57 return engine_session_->browser_context(); |
| 57 } | 58 } |
| 58 | 59 |
| 59 SettingsManager* BlimpBrowserMainParts::GetSettingsManager() { | 60 SettingsManager* BlimpBrowserMainParts::GetSettingsManager() { |
| 60 return settings_manager_.get(); | 61 return settings_manager_.get(); |
| 61 } | 62 } |
| 62 | 63 |
| 63 } // namespace engine | 64 } // namespace engine |
| 64 } // namespace blimp | 65 } // namespace blimp |
| OLD | NEW |