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

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

Issue 2800433002: Remove CWVDelegate. (Closed)
Patch Set: Respond to comments. Created 3 years, 8 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 | « ios/web_view/BUILD.gn ('k') | ios/web_view/internal/web_view_web_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web_view/internal/cwv.mm
diff --git a/ios/web_view/internal/cwv.mm b/ios/web_view/internal/cwv.mm
index e692bb47d1f31e0be78ef48673a8e5a6e41039b6..da20ce8b6736cc7a95a0879567a8e90eef19a61d 100644
--- a/ios/web_view/internal/cwv.mm
+++ b/ios/web_view/internal/cwv.mm
@@ -10,10 +10,10 @@
#import "base/mac/bind_objc_block.h"
#include "base/memory/ptr_util.h"
#include "base/single_thread_task_runner.h"
+#include "base/strings/sys_string_conversions.h"
#include "ios/web/public/app/web_main.h"
#include "ios/web/public/web_thread.h"
#import "ios/web_view/internal/web_view_web_main_delegate.h"
-#import "ios/web_view/public/cwv_delegate.h"
#import "ios/web_view/public/cwv_web_view.h"
#import "ios/web_view/public/cwv_web_view_configuration.h"
@@ -29,18 +29,12 @@ CWV* g_criwv = nil;
std::unique_ptr<ios_web_view::WebViewWebMainDelegate> _webMainDelegate;
std::unique_ptr<web::WebMain> _webMain;
}
-
-@property(nonatomic, weak) id<CWVDelegate> delegate;
-
-- (instancetype)initWithDelegate:(id<CWVDelegate>)delegate;
@end
@implementation CWV
-@synthesize delegate = _delegate;
-
-+ (void)configureWithDelegate:(id<CWVDelegate>)delegate {
- g_criwv = [[CWV alloc] initWithDelegate:delegate];
++ (void)configureWithUserAgentProductName:(NSString*)productName {
+ g_criwv = [[CWV alloc] initWithUserAgentProductName:productName];
}
+ (void)shutDown {
@@ -53,12 +47,12 @@ CWV* g_criwv = nil;
return [[CWVWebView alloc] initWithFrame:frame configuration:configuration];
}
-- (instancetype)initWithDelegate:(id<CWVDelegate>)delegate {
+- (instancetype)initWithUserAgentProductName:(NSString*)productName {
self = [super init];
if (self) {
- _delegate = delegate;
+ std::string userAgent = base::SysNSStringToUTF8(productName);
_webMainDelegate =
- base::MakeUnique<ios_web_view::WebViewWebMainDelegate>(_delegate);
+ base::MakeUnique<ios_web_view::WebViewWebMainDelegate>(userAgent);
web::WebMainParams params(_webMainDelegate.get());
_webMain = base::MakeUnique<web::WebMain>(params);
}
« no previous file with comments | « ios/web_view/BUILD.gn ('k') | ios/web_view/internal/web_view_web_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698