Move webview_tag.js to third_party, so it can be used from elsewhere.

Bug: 937995 Change-Id: I64f090e6096200cf404d2f2e4c33ce813ff90eed Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1594178 Reviewed-by: Luciano Pacheco <lucmult@chromium.org> Reviewed-by: Michael Giuffrida <michaelpg@chromium.org> Commit-Queue: Danan S <danan@chromium.org> Cr-Commit-Position: refs/heads/master@{#657776}
Denger-Network · May 8, 2019 · abaeb5e · abaeb5e
1 parent 06a4e4c
commit abaeb5e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 15 deletions.
diff --git a/ui/file_manager/externs/webview_tag.js → ...y/closure_compiler/externs/webview_tag.js b/ui/file_manager/externs/webview_tag.js → ...y/closure_compiler/externs/webview_tag.js
@@ -192,6 +192,9 @@ var SelectionRect;
  */
 function WebRequestEventInterface() {}
 
+/** @type {!WebRequestOptionallySynchronousEvent} */
+WebRequestEventInterface.prototype.onBeforeRequest;
+
 /** @type {!WebRequestOptionallySynchronousEvent} */
 WebRequestEventInterface.prototype.onBeforeSendHeaders;
 

diff --git a/ui/file_manager/externs/BUILD.gn b/ui/file_manager/externs/BUILD.gn
@@ -4,18 +4,6 @@
 
 import("//third_party/closure_compiler/compile_js.gni")
 
-js_library("webview_tag") {
-  sources = []
-
-  # The webview extern depends on chrome_extensions, which depends on chrome.
-  # They must appear together, in this order, to avoid flaky dependency chains.
-  externs_list = [
-    "$externs_path/chrome.js",
-    "$externs_path/chrome_extensions.js",
-    "webview_tag.js",
-  ]
-}
-
 js_library("file_manager_private") {
   sources = []
 

diff --git a/ui/file_manager/file_manager/background/js/BUILD.gn b/ui/file_manager/file_manager/background/js/BUILD.gn
@@ -469,9 +469,9 @@ js_library("runtime_loaded_test_util") {
   deps = [
     ":app_windows",
     ":test_util_base",
-    "../../../externs:webview_tag",
     "//ui/file_manager/base/js:error_counter",
   ]
+  externs_list = [ "$externs_path/webview_tag.js" ]
 }
 
 js_library("volume_info_impl") {

diff --git a/ui/file_manager/file_manager/cws_widget/BUILD.gn b/ui/file_manager/file_manager/cws_widget/BUILD.gn
@@ -45,6 +45,6 @@ js_library("cws_webview_client") {
   ]
   externs_list = [
     "$externs_path/chrome_extensions.js",
-    "../../externs/webview_tag.js",
+    "$externs_path/webview_tag.js",
   ]
 }
diff --git a/ui/file_manager/file_manager/foreground/elements/BUILD.gn b/ui/file_manager/file_manager/foreground/elements/BUILD.gn
@@ -45,7 +45,10 @@ js_library("files_metadata_entry") {
 js_library("files_quick_view") {
   deps = [
     ":files_metadata_box",
-    "../../../externs:webview_tag",
+  ]
+  externs_list = [
+    "$externs_path/chrome_extensions.js",
+    "$externs_path/webview_tag.js",
   ]
 }