Index: blimp/engine/browser/blimp_browser_main_parts.h |
diff --git a/blimp/engine/browser/blimp_browser_main_parts.h b/blimp/engine/browser/blimp_browser_main_parts.h |
index 5c2e991a3f70e74f58b860a122b64a4c36fe843b..139e5fbbf29a76771ce419984ee580ad406cca98 100644 |
--- a/blimp/engine/browser/blimp_browser_main_parts.h |
+++ b/blimp/engine/browser/blimp_browser_main_parts.h |
@@ -7,8 +7,8 @@ |
#include "base/macros.h" |
#include "base/memory/scoped_ptr.h" |
-#include "blimp/engine/browser/blimp_browser_context.h" |
#include "content/public/browser/browser_main_parts.h" |
+#include "content/public/common/main_function_params.h" |
Kevin M
2015/10/14 17:52:56
Prototype MainFunctionParams?
haibinlu
2015/10/15 01:59:27
Done.
|
namespace net { |
class NetLog; |
@@ -17,7 +17,9 @@ class NetLog; |
namespace blimp { |
namespace engine { |
-class BlimpScreen; |
+class BlimpBrowserContext; |
+class BlimpClientSessionManager; |
+class BlimpEngineSession; |
class BlimpBrowserMainParts : public content::BrowserMainParts { |
public: |
@@ -27,14 +29,13 @@ class BlimpBrowserMainParts : public content::BrowserMainParts { |
// content::BrowserMainParts implementation. |
void PreMainMessageLoopRun() override; |
void PostMainMessageLoopRun() override; |
- int PreCreateThreads() override; |
- BlimpBrowserContext* browser_context() { return browser_context_.get(); } |
+ BlimpBrowserContext* browser_context(); |
Kevin M
2015/10/14 17:52:56
Need to use CamelCase naming for non-trivial gette
haibinlu
2015/10/15 01:59:28
Done.
|
private: |
scoped_ptr<net::NetLog> net_log_; |
- scoped_ptr<BlimpBrowserContext> browser_context_; |
- scoped_ptr<BlimpScreen> screen_; |
+ scoped_ptr<BlimpClientSessionManager> client_session_manager_; |
+ scoped_ptr<BlimpEngineSession> engine_session_; |
DISALLOW_COPY_AND_ASSIGN(BlimpBrowserMainParts); |
}; |