Chromium Code Reviews| 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/public/cwv.h" | 5 #import "ios/web_view/public/cwv.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/location.h" | 9 #include "base/location.h" |
| 10 #import "base/mac/bind_objc_block.h" | 10 #import "base/mac/bind_objc_block.h" |
| 11 #include "base/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
| 12 #include "ios/web/public/app/web_main.h" | 12 #include "ios/web/public/app/web_main.h" |
| 13 #include "ios/web/public/web_thread.h" | 13 #include "ios/web/public/web_thread.h" |
| 14 #import "ios/web_view/internal/criwv_web_main_delegate.h" | 14 #import "ios/web_view/internal/web_view_web_main_delegate.h" |
| 15 #import "ios/web_view/public/cwv_delegate.h" | 15 #import "ios/web_view/public/cwv_delegate.h" |
| 16 #import "ios/web_view/public/cwv_web_view.h" | 16 #import "ios/web_view/public/cwv_web_view.h" |
| 17 #import "ios/web_view/public/cwv_web_view_configuration.h" | 17 #import "ios/web_view/public/cwv_web_view_configuration.h" |
| 18 #import "ios/web_view/public/cwv_website_data_store.h" | 18 #import "ios/web_view/public/cwv_website_data_store.h" |
| 19 | 19 |
| 20 #if !defined(__has_feature) || !__has_feature(objc_arc) | 20 #if !defined(__has_feature) || !__has_feature(objc_arc) |
| 21 #error "This file requires ARC support." | 21 #error "This file requires ARC support." |
| 22 #endif | 22 #endif |
| 23 | 23 |
| 24 namespace { | 24 namespace { |
| 25 CWV* g_criwv = nil; | 25 CWV* g_criwv = nil; |
| 26 } | 26 } |
| 27 | 27 |
| 28 @interface CWV () { | 28 @interface CWV () { |
| 29 std::unique_ptr<ios_web_view::CRIWVWebMainDelegate> _webMainDelegate; | 29 std::unique_ptr<ios_web_view::WebViewWebMainDelegate> _webMainDelegate; |
| 30 std::unique_ptr<web::WebMain> _webMain; | 30 std::unique_ptr<web::WebMain> _webMain; |
| 31 } | 31 } |
| 32 | 32 |
| 33 @property(nonatomic, weak) id<CWVDelegate> delegate; | 33 @property(nonatomic, weak) id<CWVDelegate> delegate; |
| 34 | 34 |
| 35 - (instancetype)initWithDelegate:(id<CWVDelegate>)delegate; | 35 - (instancetype)initWithDelegate:(id<CWVDelegate>)delegate; |
| 36 @end | 36 @end |
| 37 | 37 |
| 38 @implementation CWV | 38 @implementation CWV |
| 39 | 39 |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 52 [[CWVWebViewConfiguration alloc] init]; | 52 [[CWVWebViewConfiguration alloc] init]; |
| 53 configuration.websiteDataStore = [CWVWebsiteDataStore defaultDataStore]; | 53 configuration.websiteDataStore = [CWVWebsiteDataStore defaultDataStore]; |
| 54 | 54 |
| 55 return [[CWVWebView alloc] initWithFrame:frame configuration:configuration]; | 55 return [[CWVWebView alloc] initWithFrame:frame configuration:configuration]; |
| 56 } | 56 } |
| 57 | 57 |
| 58 - (instancetype)initWithDelegate:(id<CWVDelegate>)delegate { | 58 - (instancetype)initWithDelegate:(id<CWVDelegate>)delegate { |
| 59 self = [super init]; | 59 self = [super init]; |
| 60 if (self) { | 60 if (self) { |
| 61 _delegate = delegate; | 61 _delegate = delegate; |
| 62 _webMainDelegate.reset(new ios_web_view::CRIWVWebMainDelegate(_delegate)); | 62 _webMainDelegate.reset(new ios_web_view::WebViewWebMainDelegate(_delegate)); |
|
Eugene But (OOO till 7-30)
2017/02/25 01:29:28
Optiona nit: use base::MakeUnique here
michaeldo
2017/02/25 07:41:11
Done.
| |
| 63 web::WebMainParams params(_webMainDelegate.get()); | 63 web::WebMainParams params(_webMainDelegate.get()); |
| 64 _webMain.reset(new web::WebMain(params)); | 64 _webMain.reset(new web::WebMain(params)); |
| 65 } | 65 } |
| 66 return self; | 66 return self; |
| 67 } | 67 } |
| 68 | 68 |
| 69 - (void)dealloc { | 69 - (void)dealloc { |
| 70 _webMain.reset(); | 70 _webMain.reset(); |
| 71 _webMainDelegate.reset(); | 71 _webMainDelegate.reset(); |
| 72 } | 72 } |
| 73 | 73 |
| 74 @end | 74 @end |
| OLD | NEW |