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

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

Issue 1164963002: Fix html_viewer build after latest blink roll (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 | « no previous file | components/html_viewer/html_document.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 #ifndef COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_ 5 #ifndef COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
6 #define COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_ 6 #define COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 10
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 blink::WebLocalFrame* frame, 91 blink::WebLocalFrame* frame,
92 const blink::WebURL& url, 92 const blink::WebURL& url,
93 blink::WebMediaPlayerClient* client, 93 blink::WebMediaPlayerClient* client,
94 blink::WebContentDecryptionModule* initial_cdm); 94 blink::WebContentDecryptionModule* initial_cdm);
95 virtual blink::WebFrame* createChildFrame( 95 virtual blink::WebFrame* createChildFrame(
96 blink::WebLocalFrame* parent, 96 blink::WebLocalFrame* parent,
97 blink::WebTreeScopeType scope, 97 blink::WebTreeScopeType scope,
98 const blink::WebString& frameName, 98 const blink::WebString& frameName,
99 blink::WebSandboxFlags sandboxFlags); 99 blink::WebSandboxFlags sandboxFlags);
100 virtual void frameDetached(blink::WebFrame* frame); 100 virtual void frameDetached(blink::WebFrame* frame);
101 virtual void frameDetached(blink::WebFrame* frame, DetachType type);
102 virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame); 101 virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame);
103 virtual blink::WebNavigationPolicy decidePolicyForNavigation( 102 virtual blink::WebNavigationPolicy decidePolicyForNavigation(
104 const NavigationPolicyInfo& info); 103 const NavigationPolicyInfo& info);
105 104
106 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message, 105 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message,
107 const blink::WebString& source_name, 106 const blink::WebString& source_name,
108 unsigned source_line, 107 unsigned source_line,
109 const blink::WebString& stack_trace); 108 const blink::WebString& stack_trace);
110 virtual void didFinishLoad(blink::WebLocalFrame* frame); 109 virtual void didFinishLoad(blink::WebLocalFrame* frame);
111 virtual void didNavigateWithinPage(blink::WebLocalFrame* frame, 110 virtual void didNavigateWithinPage(blink::WebLocalFrame* frame,
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 scoped_ptr<TouchHandler> touch_handler_; 163 scoped_ptr<TouchHandler> touch_handler_;
165 164
166 FrameToViewMap frame_to_view_; 165 FrameToViewMap frame_to_view_;
167 166
168 DISALLOW_COPY_AND_ASSIGN(HTMLDocument); 167 DISALLOW_COPY_AND_ASSIGN(HTMLDocument);
169 }; 168 };
170 169
171 } // namespace html_viewer 170 } // namespace html_viewer
172 171
173 #endif // COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_ 172 #endif // COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
OLDNEW
« no previous file with comments | « no previous file | components/html_viewer/html_document.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698