| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/html_viewer/html_document.h" | 5 #include "components/html_viewer/html_document.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
| 10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 310 } | 310 } |
| 311 | 311 |
| 312 void HTMLDocument::Create( | 312 void HTMLDocument::Create( |
| 313 mojo::ApplicationConnection* connection, | 313 mojo::ApplicationConnection* connection, |
| 314 mojo::InterfaceRequest<mojo::ViewTreeClient> request) { | 314 mojo::InterfaceRequest<mojo::ViewTreeClient> request) { |
| 315 DCHECK(!transferable_state_.view_tree_delegate_impl); | 315 DCHECK(!transferable_state_.view_tree_delegate_impl); |
| 316 transferable_state_.view_tree_delegate_impl.reset( | 316 transferable_state_.view_tree_delegate_impl.reset( |
| 317 new ViewTreeDelegateImpl(this)); | 317 new ViewTreeDelegateImpl(this)); |
| 318 transferable_state_.owns_view_tree_connection = true; | 318 transferable_state_.owns_view_tree_connection = true; |
| 319 mus::ViewTreeConnection::Create( | 319 mus::ViewTreeConnection::Create( |
| 320 transferable_state_.view_tree_delegate_impl.get(), request.Pass()); | 320 transferable_state_.view_tree_delegate_impl.get(), request.Pass(), |
| 321 mus::ViewTreeConnection::CreateType::DONT_WAIT_FOR_EMBED); |
| 321 } | 322 } |
| 322 | 323 |
| 323 } // namespace html_viewer | 324 } // namespace html_viewer |
| OLD | NEW |