Commit 0227cbd7 authored by Eugene But's avatar Eugene But Committed by Commit Bot

Inject print.js into all frames.

Bug: 881876
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: Id32427383dc90c986bb6ddf3cf07b0e1fc3f5282
Reviewed-on: https://chromium-review.googlesource.com/1214756Reviewed-by: default avatarMike Dougherty <michaeldo@chromium.org>
Commit-Queue: Eugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#590139}
parent bd89a992
...@@ -135,6 +135,7 @@ js_compile_bundle("chrome_bundle_all_frames") { ...@@ -135,6 +135,7 @@ js_compile_bundle("chrome_bundle_all_frames") {
"//components/autofill/ios/form_util/resources/form.js", "//components/autofill/ios/form_util/resources/form.js",
"resources/accessibility.js", "resources/accessibility.js",
"resources/chrome_bundle_all_frames.js", "resources/chrome_bundle_all_frames.js",
"resources/print.js",
] ]
} }
...@@ -146,7 +147,6 @@ js_compile_bundle("chrome_bundle_main_frame") { ...@@ -146,7 +147,6 @@ js_compile_bundle("chrome_bundle_main_frame") {
"//components/password_manager/ios/resources/password_controller.js", "//components/password_manager/ios/resources/password_controller.js",
"resources/chrome_bundle_main_frame.js", "resources/chrome_bundle_main_frame.js",
"resources/image_fetch.js", "resources/image_fetch.js",
"resources/print.js",
] ]
deps = [ deps = [
......
...@@ -120,7 +120,7 @@ TEST_F(ChromeWebClientTest, WKWebViewEarlyPageScriptPrint) { ...@@ -120,7 +120,7 @@ TEST_F(ChromeWebClientTest, WKWebViewEarlyPageScriptPrint) {
web::ScopedTestingWebClient web_client(std::make_unique<ChromeWebClient>()); web::ScopedTestingWebClient web_client(std::make_unique<ChromeWebClient>());
NSString* script = NSString* script =
web_client.Get()->GetDocumentStartScriptForMainFrame(browser_state()); web_client.Get()->GetDocumentStartScriptForAllFrames(browser_state());
web::test::ExecuteJavaScript(web_view, script); web::test::ExecuteJavaScript(web_view, script);
EXPECT_NSEQ(@"object", EXPECT_NSEQ(@"object",
web::test::ExecuteJavaScript(web_view, @"typeof __gCrWeb.print")); web::test::ExecuteJavaScript(web_view, @"typeof __gCrWeb.print"));
......
...@@ -7,3 +7,4 @@ goog.provide('__crWeb.chromeBundleAllFrames'); ...@@ -7,3 +7,4 @@ goog.provide('__crWeb.chromeBundleAllFrames');
goog.require('__crWeb.accessibility'); goog.require('__crWeb.accessibility');
goog.require('__crWeb.form'); goog.require('__crWeb.form');
goog.require('__crWeb.print');
...@@ -8,5 +8,4 @@ goog.provide('__crWeb.chromeBundleMainFrame'); ...@@ -8,5 +8,4 @@ goog.provide('__crWeb.chromeBundleMainFrame');
goog.require('__crWeb.autofill'); goog.require('__crWeb.autofill');
goog.require('__crWeb.fill'); goog.require('__crWeb.fill');
goog.require('__crWeb.passwords'); goog.require('__crWeb.passwords');
goog.require('__crWeb.print');
goog.require('__crWeb.imageFetch'); goog.require('__crWeb.imageFetch');
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment