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..c75611c0bb801a758cb833f6a185e7b440b99335 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,12 @@ WebViewWebMainDelegate::WebViewWebMainDelegate() {} |
WebViewWebMainDelegate::~WebViewWebMainDelegate() = default; |
void WebViewWebMainDelegate::BasicStartupComplete() { |
+ // We're using CWVHTMLElement instead of CWVWebView and |
michaeldo
2017/07/12 20:04:32
Avoid we in comments. (Ref: go/avoidwe)
What abou
Eugene But (OOO till 7-30)
2017/07/12 20:05:37
nit: Please avoid "we" in the comments (go/avoidwe
jzw1
2017/07/12 20:23:37
Done.
|
+ // CWVWebViewConfiguration because the last two classes' +intialize calls in |
+ // to this method and may cause a dispatch_once deadlock coming from |
+ // ios_web_view::InitializeGlobalState(). |
base::mac::SetOverrideFrameworkBundle( |
- [NSBundle bundleForClass:[CWVWebView class]]); |
+ [NSBundle bundleForClass:[CWVHTMLElement class]]); |
} |
} // namespace ios_web_view |