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/browser/blimp_browser_main_parts.h" | 5 #include "blimp/engine/browser/blimp_browser_main_parts.h" |
6 | 6 |
7 #include "blimp/common/proto/blimp_message.pb.h" | 7 #include "blimp/common/proto/blimp_message.pb.h" |
8 #include "blimp/engine/browser/blimp_browser_context.h" | 8 #include "blimp/engine/browser/blimp_browser_context.h" |
9 #include "blimp/engine/browser/blimp_engine_session.h" | 9 #include "blimp/engine/browser/blimp_engine_session.h" |
10 #include "blimp/net/blimp_connection.h" | 10 #include "blimp/net/blimp_connection.h" |
(...skipping 27 matching lines...) Expand all Loading... |
38 new BlimpBrowserContext(false, net_log_.get())); | 38 new BlimpBrowserContext(false, net_log_.get())); |
39 engine_session_.reset(new BlimpEngineSession(browser_context.Pass())); | 39 engine_session_.reset(new BlimpEngineSession(browser_context.Pass())); |
40 engine_session_->Initialize(); | 40 engine_session_->Initialize(); |
41 | 41 |
42 // TODO(haibinlu): Create EngineConnectionManager to accept new connections. | 42 // TODO(haibinlu): Create EngineConnectionManager to accept new connections. |
43 // TODO(haibinlu): Remove these test messages and switch to using the | 43 // TODO(haibinlu): Remove these test messages and switch to using the |
44 // MessageDispatcher for incoming messages. | 44 // MessageDispatcher for incoming messages. |
45 BlimpMessage message; | 45 BlimpMessage message; |
46 message.set_type(BlimpMessage::CONTROL); | 46 message.set_type(BlimpMessage::CONTROL); |
47 message.mutable_control()->set_type(ControlMessage::CREATE_TAB); | 47 message.mutable_control()->set_type(ControlMessage::CREATE_TAB); |
48 engine_session_->OnBlimpMessage(message); | 48 engine_session_->ProcessMessage(message, net::CompletionCallback()); |
49 message.mutable_control()->set_type(ControlMessage::LOAD_URL); | 49 message.mutable_control()->set_type(ControlMessage::LOAD_URL); |
50 message.mutable_control()->mutable_load_url()->set_url( | 50 message.mutable_control()->mutable_load_url()->set_url( |
51 "https://www.google.com/"); | 51 "https://www.google.com/"); |
52 engine_session_->OnBlimpMessage(message); | 52 engine_session_->ProcessMessage(message, net::CompletionCallback()); |
53 } | 53 } |
54 | 54 |
55 void BlimpBrowserMainParts::PostMainMessageLoopRun() { | 55 void BlimpBrowserMainParts::PostMainMessageLoopRun() { |
56 engine_session_.reset(); | 56 engine_session_.reset(); |
57 } | 57 } |
58 | 58 |
59 BlimpBrowserContext* BlimpBrowserMainParts::GetBrowserContext() { | 59 BlimpBrowserContext* BlimpBrowserMainParts::GetBrowserContext() { |
60 return engine_session_->browser_context(); | 60 return engine_session_->browser_context(); |
61 } | 61 } |
62 | 62 |
63 } // namespace engine | 63 } // namespace engine |
64 } // namespace blimp | 64 } // namespace blimp |
OLD | NEW |