| 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/session/blimp_engine_session.h" | 5 #include "blimp/engine/session/blimp_engine_session.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 #include "blimp/net/blimp_connection.h" | 30 #include "blimp/net/blimp_connection.h" |
| 31 #include "blimp/net/blimp_message_multiplexer.h" | 31 #include "blimp/net/blimp_message_multiplexer.h" |
| 32 #include "blimp/net/blimp_message_thread_pipe.h" | 32 #include "blimp/net/blimp_message_thread_pipe.h" |
| 33 #include "blimp/net/blimp_stats.h" | 33 #include "blimp/net/blimp_stats.h" |
| 34 #include "blimp/net/blob_channel/blob_channel_sender_impl.h" | 34 #include "blimp/net/blob_channel/blob_channel_sender_impl.h" |
| 35 #include "blimp/net/blob_channel/helium_blob_sender_delegate.h" | 35 #include "blimp/net/blob_channel/helium_blob_sender_delegate.h" |
| 36 #include "blimp/net/browser_connection_handler.h" | 36 #include "blimp/net/browser_connection_handler.h" |
| 37 #include "blimp/net/common.h" | 37 #include "blimp/net/common.h" |
| 38 #include "blimp/net/engine_authentication_handler.h" | 38 #include "blimp/net/engine_authentication_handler.h" |
| 39 #include "blimp/net/engine_connection_manager.h" | 39 #include "blimp/net/engine_connection_manager.h" |
| 40 #include "blimp/net/grpc_engine_transport.h" |
| 40 #include "blimp/net/null_blimp_message_processor.h" | 41 #include "blimp/net/null_blimp_message_processor.h" |
| 41 #include "blimp/net/tcp_engine_transport.h" | 42 #include "blimp/net/tcp_engine_transport.h" |
| 42 #include "blimp/net/thread_pipe_manager.h" | 43 #include "blimp/net/thread_pipe_manager.h" |
| 43 #include "content/public/browser/browser_context.h" | 44 #include "content/public/browser/browser_context.h" |
| 44 #include "content/public/browser/browser_thread.h" | 45 #include "content/public/browser/browser_thread.h" |
| 45 #include "content/public/browser/navigation_controller.h" | 46 #include "content/public/browser/navigation_controller.h" |
| 46 #include "content/public/browser/navigation_entry.h" | 47 #include "content/public/browser/navigation_entry.h" |
| 47 #include "content/public/browser/render_view_host.h" | 48 #include "content/public/browser/render_view_host.h" |
| 48 #include "content/public/browser/render_widget_host.h" | 49 #include "content/public/browser/render_widget_host.h" |
| 49 #include "content/public/browser/render_widget_host_view.h" | 50 #include "content/public/browser/render_widget_host_view.h" |
| (...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 581 parent->AddChild(content); | 582 parent->AddChild(content); |
| 582 content->Show(); | 583 content->Show(); |
| 583 | 584 |
| 584 tab_ = base::MakeUnique<Tab>(std::move(new_contents), target_tab_id, | 585 tab_ = base::MakeUnique<Tab>(std::move(new_contents), target_tab_id, |
| 585 &render_widget_feature_, | 586 &render_widget_feature_, |
| 586 navigation_message_sender_.get()); | 587 navigation_message_sender_.get()); |
| 587 } | 588 } |
| 588 | 589 |
| 589 } // namespace engine | 590 } // namespace engine |
| 590 } // namespace blimp | 591 } // namespace blimp |
| OLD | NEW |