Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(589)

Unified Diff: ios/web_view/internal/web_view_web_main_delegate.mm

Issue 2750293002: Ensure framework path is set before any web objects are created. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ios/web_view/internal/web_view_web_main_parts.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 47983b49a8fc34463bb4ceddafad113d714ea5da..83188ce85c46a185f0b127497b8e07011a2a7092 100644
--- a/ios/web_view/internal/web_view_web_main_delegate.mm
+++ b/ios/web_view/internal/web_view_web_main_delegate.mm
@@ -4,9 +4,11 @@
#import "ios/web_view/internal/web_view_web_main_delegate.h"
+#import "base/mac/bundle_locations.h"
#include "base/memory/ptr_util.h"
#import "ios/web_view/internal/web_view_web_client.h"
#import "ios/web_view/public/cwv_delegate.h"
+#import "ios/web_view/public/cwv_web_view.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
@@ -20,6 +22,8 @@ WebViewWebMainDelegate::WebViewWebMainDelegate(id<CWVDelegate> delegate)
WebViewWebMainDelegate::~WebViewWebMainDelegate() = default;
void WebViewWebMainDelegate::BasicStartupComplete() {
+ base::mac::SetOverrideFrameworkBundle(
+ [NSBundle bundleForClass:[CWVWebView class]]);
web_client_ = base::MakeUnique<WebViewWebClient>(delegate_);
web::SetWebClient(web_client_.get());
}
« no previous file with comments | « no previous file | ios/web_view/internal/web_view_web_main_parts.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698