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/macros.h" |
8 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
9 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
10 #include "base/stl_util.h" | 11 #include "base/stl_util.h" |
11 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
12 #include "base/thread_task_runner_handle.h" | 13 #include "base/thread_task_runner_handle.h" |
13 #include "base/time/time.h" | 14 #include "base/time/time.h" |
14 #include "components/html_viewer/blink_url_request_type_converters.h" | 15 #include "components/html_viewer/blink_url_request_type_converters.h" |
15 #include "components/html_viewer/devtools_agent_impl.h" | 16 #include "components/html_viewer/devtools_agent_impl.h" |
16 #include "components/html_viewer/document_resource_waiter.h" | 17 #include "components/html_viewer/document_resource_waiter.h" |
17 #include "components/html_viewer/global_state.h" | 18 #include "components/html_viewer/global_state.h" |
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
322 DCHECK(!transferable_state_.window_tree_delegate_impl); | 323 DCHECK(!transferable_state_.window_tree_delegate_impl); |
323 transferable_state_.window_tree_delegate_impl.reset( | 324 transferable_state_.window_tree_delegate_impl.reset( |
324 new WindowTreeDelegateImpl(this)); | 325 new WindowTreeDelegateImpl(this)); |
325 transferable_state_.owns_window_tree_connection = true; | 326 transferable_state_.owns_window_tree_connection = true; |
326 mus::WindowTreeConnection::Create( | 327 mus::WindowTreeConnection::Create( |
327 transferable_state_.window_tree_delegate_impl.get(), request.Pass(), | 328 transferable_state_.window_tree_delegate_impl.get(), request.Pass(), |
328 mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED); | 329 mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED); |
329 } | 330 } |
330 | 331 |
331 } // namespace html_viewer | 332 } // namespace html_viewer |
OLD | NEW |