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

Side by Side Diff: mojo/services/html_viewer/html_document.cc

Issue 799113004: Update mojo sdk to rev 59145288bae55b0fce4276b017df6a1117bcf00f (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add mojo's ply to checklicenses whitelist Created 6 years 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 | « mojo/services/html_viewer/html_document.h ('k') | mojo/services/html_viewer/html_viewer.cc » ('j') | no next file with comments »
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 "mojo/services/html_viewer/html_document.h" 5 #include "mojo/services/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/message_loop/message_loop_proxy.h" 9 #include "base/message_loop/message_loop_proxy.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
11 #include "base/stl_util.h" 11 #include "base/stl_util.h"
12 #include "base/strings/string_util.h" 12 #include "base/strings/string_util.h"
13 #include "base/thread_task_runner_handle.h" 13 #include "base/thread_task_runner_handle.h"
14 #include "mojo/public/cpp/application/connect.h" 14 #include "mojo/public/cpp/application/connect.h"
15 #include "mojo/public/cpp/system/data_pipe.h" 15 #include "mojo/public/cpp/system/data_pipe.h"
16 #include "mojo/public/interfaces/application/shell.mojom.h" 16 #include "mojo/public/interfaces/application/shell.mojom.h"
17 #include "mojo/services/html_viewer/blink_input_events_type_converters.h" 17 #include "mojo/services/html_viewer/blink_input_events_type_converters.h"
18 #include "mojo/services/html_viewer/blink_url_request_type_converters.h" 18 #include "mojo/services/html_viewer/blink_url_request_type_converters.h"
19 #include "mojo/services/html_viewer/weblayertreeview_impl.h" 19 #include "mojo/services/html_viewer/weblayertreeview_impl.h"
20 #include "mojo/services/html_viewer/webmediaplayer_factory.h" 20 #include "mojo/services/html_viewer/webmediaplayer_factory.h"
21 #include "mojo/services/html_viewer/webstoragenamespace_impl.h" 21 #include "mojo/services/html_viewer/webstoragenamespace_impl.h"
22 #include "mojo/services/html_viewer/weburlloader_impl.h" 22 #include "mojo/services/html_viewer/weburlloader_impl.h"
23 #include "mojo/services/public/cpp/view_manager/view.h" 23 #include "mojo/services/surfaces/public/interfaces/surfaces_service.mojom.h"
24 #include "mojo/services/public/interfaces/surfaces/surfaces_service.mojom.h" 24 #include "mojo/services/view_manager/public/cpp/view.h"
25 #include "skia/ext/refptr.h" 25 #include "skia/ext/refptr.h"
26 #include "third_party/WebKit/public/platform/Platform.h" 26 #include "third_party/WebKit/public/platform/Platform.h"
27 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" 27 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"
28 #include "third_party/WebKit/public/platform/WebSize.h" 28 #include "third_party/WebKit/public/platform/WebSize.h"
29 #include "third_party/WebKit/public/web/WebConsoleMessage.h" 29 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
30 #include "third_party/WebKit/public/web/WebDocument.h" 30 #include "third_party/WebKit/public/web/WebDocument.h"
31 #include "third_party/WebKit/public/web/WebElement.h" 31 #include "third_party/WebKit/public/web/WebElement.h"
32 #include "third_party/WebKit/public/web/WebInputEvent.h" 32 #include "third_party/WebKit/public/web/WebInputEvent.h"
33 #include "third_party/WebKit/public/web/WebLocalFrame.h" 33 #include "third_party/WebKit/public/web/WebLocalFrame.h"
34 #include "third_party/WebKit/public/web/WebScriptSource.h" 34 #include "third_party/WebKit/public/web/WebScriptSource.h"
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 } 269 }
270 270
271 void HTMLDocument::OnViewInputEvent(View* view, const EventPtr& event) { 271 void HTMLDocument::OnViewInputEvent(View* view, const EventPtr& event) {
272 scoped_ptr<blink::WebInputEvent> web_event = 272 scoped_ptr<blink::WebInputEvent> web_event =
273 event.To<scoped_ptr<blink::WebInputEvent>>(); 273 event.To<scoped_ptr<blink::WebInputEvent>>();
274 if (web_event) 274 if (web_event)
275 web_view_->handleInputEvent(*web_event); 275 web_view_->handleInputEvent(*web_event);
276 } 276 }
277 277
278 } // namespace mojo 278 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/services/html_viewer/html_document.h ('k') | mojo/services/html_viewer/html_viewer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698