OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #import "ios/web_view/internal/web_view_web_main_delegate.h" | 5 #import "ios/web_view/internal/web_view_web_main_delegate.h" |
6 | 6 |
7 #import "base/mac/bundle_locations.h" | 7 #import "base/mac/bundle_locations.h" |
8 #import "ios/web_view/public/cwv_web_view.h" | 8 #import "ios/web_view/public/cwv_html_element.h" |
9 | 9 |
10 #if !defined(__has_feature) || !__has_feature(objc_arc) | 10 #if !defined(__has_feature) || !__has_feature(objc_arc) |
11 #error "This file requires ARC support." | 11 #error "This file requires ARC support." |
12 #endif | 12 #endif |
13 | 13 |
14 namespace ios_web_view { | 14 namespace ios_web_view { |
15 | 15 |
16 WebViewWebMainDelegate::WebViewWebMainDelegate() {} | 16 WebViewWebMainDelegate::WebViewWebMainDelegate() {} |
17 | 17 |
18 WebViewWebMainDelegate::~WebViewWebMainDelegate() = default; | 18 WebViewWebMainDelegate::~WebViewWebMainDelegate() = default; |
19 | 19 |
20 void WebViewWebMainDelegate::BasicStartupComplete() { | 20 void WebViewWebMainDelegate::BasicStartupComplete() { |
| 21 // Use CWVHTMLElement instead of CWVWebView and CWVWebViewConfiguration |
| 22 // because the latter two classes' +intialize calls in to this method and may |
| 23 // cause a deadlock. |
21 base::mac::SetOverrideFrameworkBundle( | 24 base::mac::SetOverrideFrameworkBundle( |
22 [NSBundle bundleForClass:[CWVWebView class]]); | 25 [NSBundle bundleForClass:[CWVHTMLElement class]]); |
23 } | 26 } |
24 | 27 |
25 } // namespace ios_web_view | 28 } // namespace ios_web_view |
OLD | NEW |