components/html_viewer/html_document.cc - Issue 1344573002: Mandoline: Rename components/view_manager to components/mus

Side by Side Diff: components/html_viewer/html_document.cc

Issue 1344573002: Mandoline: Rename components/view_manager to components/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased Created 5 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « components/html_viewer/html_document.h ('k') | components/html_viewer/html_frame.h » ('j') | no next file with comments »

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"

11 #include "base/strings/string_util.h"	11 #include "base/strings/string_util.h"

12 #include "base/thread_task_runner_handle.h"	12 #include "base/thread_task_runner_handle.h"

13 #include "components/html_viewer/blink_url_request_type_converters.h"	13 #include "components/html_viewer/blink_url_request_type_converters.h"

14 #include "components/html_viewer/devtools_agent_impl.h"	14 #include "components/html_viewer/devtools_agent_impl.h"

15 #include "components/html_viewer/document_resource_waiter.h"	15 #include "components/html_viewer/document_resource_waiter.h"

16 #include "components/html_viewer/global_state.h"	16 #include "components/html_viewer/global_state.h"

17 #include "components/html_viewer/html_frame.h"	17 #include "components/html_viewer/html_frame.h"

18 #include "components/html_viewer/html_frame_tree_manager.h"	18 #include "components/html_viewer/html_frame_tree_manager.h"

19 #include "components/html_viewer/test_html_viewer_impl.h"	19 #include "components/html_viewer/test_html_viewer_impl.h"

20 #include "components/html_viewer/web_url_loader_impl.h"	20 #include "components/html_viewer/web_url_loader_impl.h"

21 #include "components/view_manager/ids.h"	21 #include "components/mus/ids.h"

22 #include "components/view_manager/public/cpp/view.h"	22 #include "components/mus/public/cpp/view.h"

23 #include "components/view_manager/public/cpp/view_tree_connection.h"	23 #include "components/mus/public/cpp/view_tree_connection.h"

24 #include "mojo/application/public/cpp/application_impl.h"	24 #include "mojo/application/public/cpp/application_impl.h"

25 #include "mojo/application/public/cpp/connect.h"	25 #include "mojo/application/public/cpp/connect.h"

26 #include "mojo/application/public/interfaces/shell.mojom.h"	26 #include "mojo/application/public/interfaces/shell.mojom.h"

27 #include "mojo/converters/geometry/geometry_type_converters.h"	27 #include "mojo/converters/geometry/geometry_type_converters.h"

28 #include "third_party/WebKit/public/web/WebLocalFrame.h"	28 #include "third_party/WebKit/public/web/WebLocalFrame.h"

29 #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"	29 #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"

30 #include "ui/gfx/geometry/dip_util.h"	30 #include "ui/gfx/geometry/dip_util.h"

31 #include "ui/gfx/geometry/size.h"	31 #include "ui/gfx/geometry/size.h"

32	32

33 using mojo::AxProvider;	33 using mojo::AxProvider;

(...skipping 280 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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 mojo::ViewTreeConnection::Create(	319 mojo::ViewTreeConnection::Create(

320 transferable_state_.view_tree_delegate_impl.get(), request.Pass());	320 transferable_state_.view_tree_delegate_impl.get(), request.Pass());

321 }	321 }

322	322

323 } // namespace html_viewer	323 } // namespace html_viewer

OLD	NEW