Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(243)

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

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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
OLDNEW
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 "base/time/time.h" 13 #include "base/time/time.h"
14 #include "components/html_viewer/blink_url_request_type_converters.h" 14 #include "components/html_viewer/blink_url_request_type_converters.h"
15 #include "components/html_viewer/devtools_agent_impl.h" 15 #include "components/html_viewer/devtools_agent_impl.h"
16 #include "components/html_viewer/document_resource_waiter.h" 16 #include "components/html_viewer/document_resource_waiter.h"
17 #include "components/html_viewer/global_state.h" 17 #include "components/html_viewer/global_state.h"
18 #include "components/html_viewer/html_frame.h" 18 #include "components/html_viewer/html_frame.h"
19 #include "components/html_viewer/html_frame_tree_manager.h" 19 #include "components/html_viewer/html_frame_tree_manager.h"
20 #include "components/html_viewer/test_html_viewer_impl.h" 20 #include "components/html_viewer/test_html_viewer_impl.h"
21 #include "components/html_viewer/web_url_loader_impl.h" 21 #include "components/html_viewer/web_url_loader_impl.h"
22 #include "components/mus/public/cpp/window.h" 22 #include "components/mus/public/cpp/window.h"
23 #include "components/mus/public/cpp/window_tree_connection.h" 23 #include "components/mus/public/cpp/window_tree_connection.h"
24 #include "components/mus/ws/ids.h" 24 #include "components/mus/ws/ids.h"
25 #include "mojo/application/public/cpp/application_impl.h" 25 #include "mojo/application/public/cpp/application_impl.h"
26 #include "mojo/application/public/cpp/connect.h" 26 #include "mojo/application/public/cpp/connect.h"
27 #include "mojo/application/public/interfaces/shell.mojom.h" 27 #include "mojo/application/public/interfaces/shell.mojom.h"
28 #include "mojo/converters/geometry/geometry_type_converters.h" 28 #include "mojo/converters/geometry/geometry_type_converters.h"
29 #include "mojo/public/cpp/system/data_pipe.h"
29 #include "third_party/WebKit/public/web/WebLocalFrame.h" 30 #include "third_party/WebKit/public/web/WebLocalFrame.h"
30 #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"
31 #include "ui/gfx/geometry/dip_util.h" 31 #include "ui/gfx/geometry/dip_util.h"
32 #include "ui/gfx/geometry/size.h" 32 #include "ui/gfx/geometry/size.h"
33 33
34 using mojo::AxProvider; 34 using mojo::AxProvider;
35 using mus::Window; 35 using mus::Window;
36 36
37 namespace html_viewer { 37 namespace html_viewer {
38 namespace { 38 namespace {
39 39
40 const char kEnableTestInterface[] = "enable-html-viewer-test-interface"; 40 const char kEnableTestInterface[] = "enable-html-viewer-test-interface";
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 DCHECK(!transferable_state_.window_tree_delegate_impl); 322 DCHECK(!transferable_state_.window_tree_delegate_impl);
323 transferable_state_.window_tree_delegate_impl.reset( 323 transferable_state_.window_tree_delegate_impl.reset(
324 new WindowTreeDelegateImpl(this)); 324 new WindowTreeDelegateImpl(this));
325 transferable_state_.owns_window_tree_connection = true; 325 transferable_state_.owns_window_tree_connection = true;
326 mus::WindowTreeConnection::Create( 326 mus::WindowTreeConnection::Create(
327 transferable_state_.window_tree_delegate_impl.get(), request.Pass(), 327 transferable_state_.window_tree_delegate_impl.get(), request.Pass(),
328 mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED); 328 mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED);
329 } 329 }
330 330
331 } // namespace html_viewer 331 } // namespace html_viewer
OLDNEW
« no previous file with comments | « components/html_viewer/document_resource_waiter.h ('k') | components/html_viewer/html_document_application_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698