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

Unified Diff: mojo/services/html_viewer/html_document_view.h

Issue 469803005: Mojo: simple iframe support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: darin Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | mojo/services/html_viewer/html_document_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/html_viewer/html_document_view.h
diff --git a/mojo/services/html_viewer/html_document_view.h b/mojo/services/html_viewer/html_document_view.h
index af315bb75fb25c9e3f1b13abd0c016eb25d27d14..52427af3eb384d69fbcb4ddfeda773fea5df5adc 100644
--- a/mojo/services/html_viewer/html_document_view.h
+++ b/mojo/services/html_viewer/html_document_view.h
@@ -41,6 +41,9 @@ class HTMLDocumentView : public blink::WebViewClient,
virtual bool allowsBrokenNullLayerTreeView() const;
// WebFrameClient methods:
+ virtual blink::WebFrame* createChildFrame(blink::WebLocalFrame* parent,
+ const blink::WebString& frameName);
+ virtual void frameDetached(blink::WebFrame*);
virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame);
virtual blink::WebNavigationPolicy decidePolicyForNavigation(
blink::WebLocalFrame* frame, blink::WebDataSource::ExtraData* data,
@@ -66,11 +69,10 @@ class HTMLDocumentView : public blink::WebViewClient,
void Repaint();
ViewManager* view_manager_;
- View* view_;
+ LazyInterfacePtr<NavigatorHost> navigator_host_;
blink::WebView* web_view_;
View* root_;
bool repaint_pending_;
- LazyInterfacePtr<NavigatorHost> navigator_host_;
base::WeakPtrFactory<HTMLDocumentView> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(HTMLDocumentView);
« no previous file with comments | « no previous file | mojo/services/html_viewer/html_document_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698