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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1139123006: Fork the mojo shell interfaces used by Mandoline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 5 years, 7 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_viewer.cc » ('j') | mojo/tools/rev_sdk.py » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop/message_loop_proxy.h" 10 #include "base/message_loop/message_loop_proxy.h"
11 #include "base/single_thread_task_runner.h" 11 #include "base/single_thread_task_runner.h"
12 #include "base/stl_util.h" 12 #include "base/stl_util.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "base/thread_task_runner_handle.h" 14 #include "base/thread_task_runner_handle.h"
15 #include "components/html_viewer/blink_input_events_type_converters.h" 15 #include "components/html_viewer/blink_input_events_type_converters.h"
16 #include "components/html_viewer/blink_url_request_type_converters.h" 16 #include "components/html_viewer/blink_url_request_type_converters.h"
17 #include "components/html_viewer/setup.h" 17 #include "components/html_viewer/setup.h"
18 #include "components/html_viewer/web_layer_tree_view_impl.h" 18 #include "components/html_viewer/web_layer_tree_view_impl.h"
19 #include "components/html_viewer/web_media_player_factory.h" 19 #include "components/html_viewer/web_media_player_factory.h"
20 #include "components/html_viewer/web_storage_namespace_impl.h" 20 #include "components/html_viewer/web_storage_namespace_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/surfaces/public/interfaces/surfaces.mojom.h" 22 #include "components/surfaces/public/interfaces/surfaces.mojom.h"
23 #include "components/view_manager/public/cpp/view.h" 23 #include "components/view_manager/public/cpp/view.h"
24 #include "media/blink/webencryptedmediaclient_impl.h" 24 #include "media/blink/webencryptedmediaclient_impl.h"
25 #include "media/cdm/default_cdm_factory.h" 25 #include "media/cdm/default_cdm_factory.h"
26 #include "media/filters/default_media_permission.h" 26 #include "media/filters/default_media_permission.h"
27 #include "mojo/application/public/cpp/application_impl.h"
28 #include "mojo/application/public/cpp/connect.h"
29 #include "mojo/application/public/interfaces/shell.mojom.h"
27 #include "skia/ext/refptr.h" 30 #include "skia/ext/refptr.h"
28 #include "third_party/WebKit/public/platform/Platform.h" 31 #include "third_party/WebKit/public/platform/Platform.h"
29 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" 32 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"
30 #include "third_party/WebKit/public/platform/WebSize.h" 33 #include "third_party/WebKit/public/platform/WebSize.h"
31 #include "third_party/WebKit/public/web/WebConsoleMessage.h" 34 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
32 #include "third_party/WebKit/public/web/WebDocument.h" 35 #include "third_party/WebKit/public/web/WebDocument.h"
33 #include "third_party/WebKit/public/web/WebElement.h" 36 #include "third_party/WebKit/public/web/WebElement.h"
34 #include "third_party/WebKit/public/web/WebInputEvent.h" 37 #include "third_party/WebKit/public/web/WebInputEvent.h"
35 #include "third_party/WebKit/public/web/WebLocalFrame.h" 38 #include "third_party/WebKit/public/web/WebLocalFrame.h"
36 #include "third_party/WebKit/public/web/WebScriptSource.h" 39 #include "third_party/WebKit/public/web/WebScriptSource.h"
37 #include "third_party/WebKit/public/web/WebSettings.h" 40 #include "third_party/WebKit/public/web/WebSettings.h"
38 #include "third_party/WebKit/public/web/WebView.h" 41 #include "third_party/WebKit/public/web/WebView.h"
39 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
40 #include "third_party/mojo/src/mojo/public/cpp/application/connect.h"
41 #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" 42 #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"
42 #include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h"
43 #include "third_party/skia/include/core/SkCanvas.h" 43 #include "third_party/skia/include/core/SkCanvas.h"
44 #include "third_party/skia/include/core/SkColor.h" 44 #include "third_party/skia/include/core/SkColor.h"
45 #include "third_party/skia/include/core/SkDevice.h" 45 #include "third_party/skia/include/core/SkDevice.h"
46 #include "ui/gfx/geometry/dip_util.h" 46 #include "ui/gfx/geometry/dip_util.h"
47 #include "ui/gfx/geometry/size.h" 47 #include "ui/gfx/geometry/size.h"
48 48
49 using mojo::AxProvider; 49 using mojo::AxProvider;
50 using mojo::Rect; 50 using mojo::Rect;
51 using mojo::ServiceProviderPtr; 51 using mojo::ServiceProviderPtr;
52 using mojo::URLResponsePtr; 52 using mojo::URLResponsePtr;
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 return media_permission_.get(); 401 return media_permission_.get();
402 } 402 }
403 403
404 media::CdmFactory* HTMLDocument::GetCdmFactory() { 404 media::CdmFactory* HTMLDocument::GetCdmFactory() {
405 if (!cdm_factory_) 405 if (!cdm_factory_)
406 cdm_factory_.reset(new media::DefaultCdmFactory()); 406 cdm_factory_.reset(new media::DefaultCdmFactory());
407 return cdm_factory_.get(); 407 return cdm_factory_.get();
408 } 408 }
409 409
410 } // namespace html_viewer 410 } // namespace html_viewer
OLDNEW
« no previous file with comments | « components/html_viewer/html_document.h ('k') | components/html_viewer/html_viewer.cc » ('j') | mojo/tools/rev_sdk.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698