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

Unified Diff: components/html_viewer/html_document.h

Issue 1218323002: Hook up test runner to new layout_test_html_viewer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updates Created 5 years, 5 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
Index: components/html_viewer/html_document.h
diff --git a/components/html_viewer/html_document.h b/components/html_viewer/html_document.h
index 7ee1604be1de3c5dd33120d78cf6f6ddb9816b3e..60fe35f2cd19d41591e7f7903f3df7cd05b31ff5 100644
--- a/components/html_viewer/html_document.h
+++ b/components/html_viewer/html_document.h
@@ -81,21 +81,11 @@ class HTMLDocument : public blink::WebViewClient,
// Deletes this object.
void Destroy();
- private:
- // Data associated with a child iframe.
- struct ChildFrameData {
- mojo::View* view;
- blink::WebTreeScopeType scope;
- };
+ blink::WebView* web_view() const { return web_view_; }
+ protected:
~HTMLDocument() override;
- // Updates the size and scale factor of the webview and related classes from
- // |root_|.
- void UpdateWebviewSizeFromViewSize();
-
- void InitGlobalStateAndLoadIfNecessary();
-
// WebViewClient methods:
virtual blink::WebStorageNamespace* createSessionStorageNamespace();
@@ -130,6 +120,19 @@ class HTMLDocument : public blink::WebViewClient,
blink::WebHistoryCommitType commit_type);
virtual blink::WebEncryptedMediaClient* encryptedMediaClient();
+ private:
+ // Data associated with a child iframe.
+ struct ChildFrameData {
+ mojo::View* view;
+ blink::WebTreeScopeType scope;
+ };
+
+ // Updates the size and scale factor of the webview and related classes from
+ // |root_|.
+ void UpdateWebviewSizeFromViewSize();
+
+ void InitGlobalStateAndLoadIfNecessary();
+
// ViewManagerDelegate methods:
void OnEmbed(mojo::View* root) override;
void OnViewManagerDestroyed(mojo::ViewManager* view_manager) override;
« no previous file with comments | « components/html_viewer/content_handler_impl.h ('k') | components/html_viewer/html_document_application_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698