Chromium Code Reviews| 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 40b0be9e71647e1a4f2ad7e29f43c18fe62b85f1..0046e90417317881fcea4a0089678e9e8236c6c5 100644 |
| --- a/ios/web_view/internal/web_view_web_main_delegate.mm |
| +++ b/ios/web_view/internal/web_view_web_main_delegate.mm |
| @@ -5,12 +5,18 @@ |
| #import "ios/web_view/internal/web_view_web_main_delegate.h" |
| #import "base/mac/bundle_locations.h" |
| -#import "ios/web_view/public/cwv_html_element.h" |
| #if !defined(__has_feature) || !__has_feature(objc_arc) |
| #error "This file requires ARC support." |
| #endif |
| +// Objective-C dummy object used to locate the containing NSBundle. |
|
Eugene But (OOO till 7-30)
2017/07/14 00:22:43
This should probably be a part of a different CL
Hiroshi Ichikawa
2017/07/14 01:18:39
+1
jzw1
2017/07/14 02:09:50
Done.
|
| +@interface CWVBundleLocator : NSObject |
| +@end |
| + |
| +@implementation CWVBundleLocator |
| +@end |
| + |
| namespace ios_web_view { |
| WebViewWebMainDelegate::WebViewWebMainDelegate() {} |
| @@ -18,11 +24,8 @@ 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:[CWVHTMLElement class]]); |
| + [NSBundle bundleForClass:[CWVBundleLocator class]]); |
| } |
| } // namespace ios_web_view |