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 <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
12 #include "base/single_thread_task_runner.h" | 12 #include "base/single_thread_task_runner.h" |
13 #include "base/stl_util.h" | 13 #include "base/stl_util.h" |
14 #include "base/strings/string_util.h" | 14 #include "base/strings/string_util.h" |
15 #include "base/thread_task_runner_handle.h" | 15 #include "base/thread_task_runner_handle.h" |
16 #include "base/time/time.h" | 16 #include "base/time/time.h" |
17 #include "components/html_viewer/blink_url_request_type_converters.h" | 17 #include "components/html_viewer/blink_url_request_type_converters.h" |
18 #include "components/html_viewer/devtools_agent_impl.h" | 18 #include "components/html_viewer/devtools_agent_impl.h" |
19 #include "components/html_viewer/document_resource_waiter.h" | 19 #include "components/html_viewer/document_resource_waiter.h" |
20 #include "components/html_viewer/global_state.h" | 20 #include "components/html_viewer/global_state.h" |
21 #include "components/html_viewer/html_frame.h" | 21 #include "components/html_viewer/html_frame.h" |
22 #include "components/html_viewer/html_frame_tree_manager.h" | 22 #include "components/html_viewer/html_frame_tree_manager.h" |
23 #include "components/html_viewer/test_html_viewer_impl.h" | 23 #include "components/html_viewer/test_html_viewer_impl.h" |
24 #include "components/html_viewer/web_url_loader_impl.h" | 24 #include "components/html_viewer/web_url_loader_impl.h" |
25 #include "components/mus/public/cpp/window.h" | 25 #include "components/mus/public/cpp/window.h" |
26 #include "components/mus/public/cpp/window_tree_connection.h" | 26 #include "components/mus/public/cpp/window_tree_connection.h" |
27 #include "components/mus/ws/ids.h" | 27 #include "components/mus/ws/ids.h" |
28 #include "mojo/application/public/cpp/application_impl.h" | |
29 #include "mojo/application/public/cpp/connect.h" | |
30 #include "mojo/application/public/interfaces/shell.mojom.h" | |
31 #include "mojo/converters/geometry/geometry_type_converters.h" | 28 #include "mojo/converters/geometry/geometry_type_converters.h" |
32 #include "mojo/public/cpp/system/data_pipe.h" | 29 #include "mojo/public/cpp/system/data_pipe.h" |
| 30 #include "mojo/shell/public/cpp/application_impl.h" |
| 31 #include "mojo/shell/public/cpp/connect.h" |
| 32 #include "mojo/shell/public/interfaces/shell.mojom.h" |
33 #include "third_party/WebKit/public/web/WebLocalFrame.h" | 33 #include "third_party/WebKit/public/web/WebLocalFrame.h" |
34 #include "ui/gfx/geometry/dip_util.h" | 34 #include "ui/gfx/geometry/dip_util.h" |
35 #include "ui/gfx/geometry/size.h" | 35 #include "ui/gfx/geometry/size.h" |
36 | 36 |
37 using mojo::AxProvider; | 37 using mojo::AxProvider; |
38 using mus::Window; | 38 using mus::Window; |
39 | 39 |
40 namespace html_viewer { | 40 namespace html_viewer { |
41 namespace { | 41 namespace { |
42 | 42 |
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
325 DCHECK(!transferable_state_.window_tree_delegate_impl); | 325 DCHECK(!transferable_state_.window_tree_delegate_impl); |
326 transferable_state_.window_tree_delegate_impl.reset( | 326 transferable_state_.window_tree_delegate_impl.reset( |
327 new WindowTreeDelegateImpl(this)); | 327 new WindowTreeDelegateImpl(this)); |
328 transferable_state_.owns_window_tree_connection = true; | 328 transferable_state_.owns_window_tree_connection = true; |
329 mus::WindowTreeConnection::Create( | 329 mus::WindowTreeConnection::Create( |
330 transferable_state_.window_tree_delegate_impl.get(), std::move(request), | 330 transferable_state_.window_tree_delegate_impl.get(), std::move(request), |
331 mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED); | 331 mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED); |
332 } | 332 } |
333 | 333 |
334 } // namespace html_viewer | 334 } // namespace html_viewer |
OLD | NEW |