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_web_view.h" | 5 #import "ios/web_view/public/cwv_web_view.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #import "base/ios/weak_nsobject.h" | 10 #import "base/ios/weak_nsobject.h" |
11 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
12 #include "base/strings/sys_string_conversions.h" | 12 #include "base/strings/sys_string_conversions.h" |
13 #import "ios/web/public/navigation_manager.h" | 13 #import "ios/web/public/navigation_manager.h" |
14 #include "ios/web/public/referrer.h" | 14 #include "ios/web/public/referrer.h" |
15 #import "ios/web/public/web_state/js/crw_js_injection_receiver.h" | 15 #import "ios/web/public/web_state/js/crw_js_injection_receiver.h" |
16 #import "ios/web/public/web_state/ui/crw_web_delegate.h" | 16 #import "ios/web/public/web_state/ui/crw_web_delegate.h" |
17 #import "ios/web/public/web_state/web_state.h" | 17 #import "ios/web/public/web_state/web_state.h" |
18 #import "ios/web/public/web_state/web_state_delegate_bridge.h" | 18 #import "ios/web/public/web_state/web_state_delegate_bridge.h" |
19 #import "ios/web/public/web_state/web_state_observer_bridge.h" | 19 #import "ios/web/public/web_state/web_state_observer_bridge.h" |
20 #import "ios/web_view/internal/cwv_website_data_store_internal.h" | 20 #import "ios/web_view/internal/cwv_website_data_store_internal.h" |
21 #import "ios/web_view/internal/translate/criwv_translate_client.h" | 21 #import "ios/web_view/internal/translate/web_view_translate_client.h" |
22 #include "ios/web_view/internal/web_view_browser_state.h" | 22 #include "ios/web_view/internal/web_view_browser_state.h" |
23 #import "ios/web_view/public/cwv_web_view_configuration.h" | 23 #import "ios/web_view/public/cwv_web_view_configuration.h" |
24 #import "ios/web_view/public/cwv_web_view_delegate.h" | 24 #import "ios/web_view/public/cwv_web_view_delegate.h" |
25 #import "ios/web_view/public/cwv_website_data_store.h" | 25 #import "ios/web_view/public/cwv_website_data_store.h" |
26 #import "net/base/mac/url_conversions.h" | 26 #import "net/base/mac/url_conversions.h" |
27 #include "ui/base/page_transition_types.h" | 27 #include "ui/base/page_transition_types.h" |
28 #include "url/gurl.h" | 28 #include "url/gurl.h" |
29 | 29 |
30 #if !defined(__has_feature) || !__has_feature(objc_arc) | 30 #if !defined(__has_feature) || !__has_feature(objc_arc) |
31 #error "This file requires ARC support." | 31 #error "This file requires ARC support." |
(...skipping 24 matching lines...) Expand all Loading... |
56 [configuration.websiteDataStore browserState]); | 56 [configuration.websiteDataStore browserState]); |
57 _webState = web::WebState::Create(webStateCreateParams); | 57 _webState = web::WebState::Create(webStateCreateParams); |
58 _webState->SetWebUsageEnabled(true); | 58 _webState->SetWebUsageEnabled(true); |
59 | 59 |
60 _webStateObserver = | 60 _webStateObserver = |
61 base::MakeUnique<web::WebStateObserverBridge>(_webState.get(), self); | 61 base::MakeUnique<web::WebStateObserverBridge>(_webState.get(), self); |
62 _webStateDelegate = base::MakeUnique<web::WebStateDelegateBridge>(self); | 62 _webStateDelegate = base::MakeUnique<web::WebStateDelegateBridge>(self); |
63 _webState->SetDelegate(_webStateDelegate.get()); | 63 _webState->SetDelegate(_webStateDelegate.get()); |
64 | 64 |
65 // Initialize Translate. | 65 // Initialize Translate. |
66 ios_web_view::CRIWVTranslateClient::CreateForWebState(_webState.get()); | 66 ios_web_view::WebViewTranslateClient::CreateForWebState(_webState.get()); |
67 } | 67 } |
68 return self; | 68 return self; |
69 } | 69 } |
70 | 70 |
71 - (void)willMoveToSuperview:(UIView*)newSuperview { | 71 - (void)willMoveToSuperview:(UIView*)newSuperview { |
72 [super willMoveToSuperview:newSuperview]; | 72 [super willMoveToSuperview:newSuperview]; |
73 UIView* subview = _webState->GetView(); | 73 UIView* subview = _webState->GetView(); |
74 if (subview.superview == self) { | 74 if (subview.superview == self) { |
75 return; | 75 return; |
76 } | 76 } |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 - (void)evaluateJavaScript:(NSString*)javaScriptString | 136 - (void)evaluateJavaScript:(NSString*)javaScriptString |
137 completionHandler:(void (^)(id, NSError*))completionHandler { | 137 completionHandler:(void (^)(id, NSError*))completionHandler { |
138 [_webState->GetJSInjectionReceiver() executeJavaScript:javaScriptString | 138 [_webState->GetJSInjectionReceiver() executeJavaScript:javaScriptString |
139 completionHandler:completionHandler]; | 139 completionHandler:completionHandler]; |
140 } | 140 } |
141 | 141 |
142 - (void)setDelegate:(id<CWVWebViewDelegate>)delegate { | 142 - (void)setDelegate:(id<CWVWebViewDelegate>)delegate { |
143 _delegate = delegate; | 143 _delegate = delegate; |
144 | 144 |
145 // Set up the translate delegate. | 145 // Set up the translate delegate. |
146 ios_web_view::CRIWVTranslateClient* translateClient = | 146 ios_web_view::WebViewTranslateClient* translateClient = |
147 ios_web_view::CRIWVTranslateClient::FromWebState(_webState.get()); | 147 ios_web_view::WebViewTranslateClient::FromWebState(_webState.get()); |
148 id<CWVTranslateDelegate> translateDelegate = nil; | 148 id<CWVTranslateDelegate> translateDelegate = nil; |
149 if ([_delegate respondsToSelector:@selector(translateDelegate)]) | 149 if ([_delegate respondsToSelector:@selector(translateDelegate)]) |
150 translateDelegate = [_delegate translateDelegate]; | 150 translateDelegate = [_delegate translateDelegate]; |
151 translateClient->set_translate_delegate(translateDelegate); | 151 translateClient->set_translate_delegate(translateDelegate); |
152 } | 152 } |
153 | 153 |
154 - (void)notifyDidUpdateWithChanges:(CRIWVWebViewUpdateType)changes { | 154 - (void)notifyDidUpdateWithChanges:(CRIWVWebViewUpdateType)changes { |
155 SEL selector = @selector(webView:didUpdateWithChanges:); | 155 SEL selector = @selector(webView:didUpdateWithChanges:); |
156 if ([_delegate respondsToSelector:selector]) { | 156 if ([_delegate respondsToSelector:selector]) { |
157 [_delegate webView:self didUpdateWithChanges:changes]; | 157 [_delegate webView:self didUpdateWithChanges:changes]; |
(...skipping 21 matching lines...) Expand all Loading... |
179 loadSuccess:success]; | 179 loadSuccess:success]; |
180 } | 180 } |
181 } | 181 } |
182 | 182 |
183 - (void)webState:(web::WebState*)webState | 183 - (void)webState:(web::WebState*)webState |
184 didChangeLoadingProgress:(double)progress { | 184 didChangeLoadingProgress:(double)progress { |
185 [self notifyDidUpdateWithChanges:CRIWVWebViewUpdateTypeProgress]; | 185 [self notifyDidUpdateWithChanges:CRIWVWebViewUpdateTypeProgress]; |
186 } | 186 } |
187 | 187 |
188 @end | 188 @end |
OLD | NEW |