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

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

Issue 1296453004: Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cherry-pick GL_APIENTRY addition back in Created 5 years, 4 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_frame.h ('k') | components/html_viewer/web_socket_handle_impl.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_frame.h" 5 #include "components/html_viewer/html_frame.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 #include "ui/gfx/geometry/size.h" 64 #include "ui/gfx/geometry/size.h"
65 #include "url/origin.h" 65 #include "url/origin.h"
66 66
67 using mandoline::HTMLMessageEvent; 67 using mandoline::HTMLMessageEvent;
68 using mandoline::HTMLMessageEventPtr; 68 using mandoline::HTMLMessageEventPtr;
69 using mojo::AxProvider; 69 using mojo::AxProvider;
70 using mojo::Rect; 70 using mojo::Rect;
71 using mojo::ServiceProviderPtr; 71 using mojo::ServiceProviderPtr;
72 using mojo::URLResponsePtr; 72 using mojo::URLResponsePtr;
73 using mojo::View; 73 using mojo::View;
74 using mojo::WeakBindToRequest;
75 74
76 namespace html_viewer { 75 namespace html_viewer {
77 namespace { 76 namespace {
78 77
79 mandoline::NavigationTargetType WebNavigationPolicyToNavigationTarget( 78 mandoline::NavigationTargetType WebNavigationPolicyToNavigationTarget(
80 blink::WebNavigationPolicy policy) { 79 blink::WebNavigationPolicy policy) {
81 switch (policy) { 80 switch (policy) {
82 case blink::WebNavigationPolicyCurrentTab: 81 case blink::WebNavigationPolicyCurrentTab:
83 return mandoline::NAVIGATION_TARGET_TYPE_EXISTING_FRAME; 82 return mandoline::NAVIGATION_TARGET_TYPE_EXISTING_FRAME;
84 case blink::WebNavigationPolicyNewBackgroundTab: 83 case blink::WebNavigationPolicyNewBackgroundTab:
(...skipping 798 matching lines...) Expand 10 before | Expand all | Expand 10 after
883 882
884 void HTMLFrame::reload(bool ignore_cache, bool is_client_redirect) { 883 void HTMLFrame::reload(bool ignore_cache, bool is_client_redirect) {
885 NOTIMPLEMENTED(); 884 NOTIMPLEMENTED();
886 } 885 }
887 886
888 void HTMLFrame::forwardInputEvent(const blink::WebInputEvent* event) { 887 void HTMLFrame::forwardInputEvent(const blink::WebInputEvent* event) {
889 NOTIMPLEMENTED(); 888 NOTIMPLEMENTED();
890 } 889 }
891 890
892 } // namespace mojo 891 } // namespace mojo
OLDNEW
« no previous file with comments | « components/html_viewer/html_frame.h ('k') | components/html_viewer/web_socket_handle_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698