Index: ios/web_view/internal/web_view_web_main_delegate.mm |
diff --git a/ios/web_view/internal/web_view_web_main_delegate.mm b/ios/web_view/internal/web_view_web_main_delegate.mm |
index 3d24bbe89544705c75a80f5aa6e2300b9ff694e3..40b0be9e71647e1a4f2ad7e29f43c18fe62b85f1 100644 |
--- a/ios/web_view/internal/web_view_web_main_delegate.mm |
+++ b/ios/web_view/internal/web_view_web_main_delegate.mm |
@@ -5,7 +5,7 @@ |
#import "ios/web_view/internal/web_view_web_main_delegate.h" |
#import "base/mac/bundle_locations.h" |
-#import "ios/web_view/public/cwv_web_view.h" |
+#import "ios/web_view/public/cwv_html_element.h" |
#if !defined(__has_feature) || !__has_feature(objc_arc) |
#error "This file requires ARC support." |
@@ -18,8 +18,11 @@ WebViewWebMainDelegate::WebViewWebMainDelegate() {} |
WebViewWebMainDelegate::~WebViewWebMainDelegate() = default; |
void WebViewWebMainDelegate::BasicStartupComplete() { |
+ // Use CWVHTMLElement instead of CWVWebView and CWVWebViewConfiguration |
+ // because the latter two classes' +intialize calls in to this method and may |
+ // cause a deadlock. |
base::mac::SetOverrideFrameworkBundle( |
- [NSBundle bundleForClass:[CWVWebView class]]); |
+ [NSBundle bundleForClass:[CWVHTMLElement class]]); |
} |
} // namespace ios_web_view |