| Index: ios/web/web_state/web_state_observer_bridge.mm
|
| diff --git a/ios/web/web_state/web_state_observer_bridge.mm b/ios/web/web_state/web_state_observer_bridge.mm
|
| index c0b2db43b7fc55a0e621200a5e4a7e0ab9ccd07e..eef1be783c37a632660177dc0919061d701e4eae 100644
|
| --- a/ios/web/web_state/web_state_observer_bridge.mm
|
| +++ b/ios/web/web_state/web_state_observer_bridge.mm
|
| @@ -14,20 +14,48 @@ WebStateObserverBridge::WebStateObserverBridge(web::WebState* webState,
|
| WebStateObserverBridge::~WebStateObserverBridge() {
|
| }
|
|
|
| +void WebStateObserverBridge::NavigationItemCommitted(
|
| + const web::LoadCommittedDetails& load_detatils) {
|
| + SEL selector = @selector(webState:didCommitNavigationWithDetails:);
|
| + if ([observer_ respondsToSelector:selector]) {
|
| + [observer_ webState:web_state()
|
| + didCommitNavigationWithDetails:load_detatils];
|
| + }
|
| +}
|
| +
|
| void WebStateObserverBridge::PageLoaded(
|
| web::PageLoadCompletionStatus load_completion_status) {
|
| - SEL selector = @selector(pageLoaded:);
|
| + SEL selector = @selector(webStateDidLoadPage:);
|
| + if ([observer_ respondsToSelector:selector])
|
| + [observer_ webStateDidLoadPage:web_state()];
|
| +}
|
| +
|
| +void WebStateObserverBridge::InsterstitialDismissed() {
|
| + SEL selector = @selector(webStateDidDismissInterstitial:);
|
| + if ([observer_ respondsToSelector:selector])
|
| + [observer_ webStateDidDismissInterstitial:web_state()];
|
| +}
|
| +
|
| +void WebStateObserverBridge::UrlHashChanged() {
|
| + SEL selector = @selector(webStateDidChangeURLHash:);
|
| + if ([observer_ respondsToSelector:selector])
|
| + [observer_ webStateDidChangeURLHash:web_state()];
|
| +}
|
| +
|
| +void WebStateObserverBridge::HistoryStateChanged() {
|
| + SEL selector = @selector(webStateDidChangeHistoryState:);
|
| if ([observer_ respondsToSelector:selector])
|
| - [observer_ pageLoaded:web_state()];
|
| + [observer_ webStateDidChangeHistoryState:web_state()];
|
| }
|
|
|
| -void WebStateObserverBridge::DocumentSubmitted(
|
| - const std::string& form_name, bool user_interaction) {
|
| - SEL selector = @selector(documentSubmitted:formName:userInteraction:);
|
| +void WebStateObserverBridge::DocumentSubmitted(const std::string& form_name,
|
| + bool user_initiated) {
|
| + SEL selector =
|
| + @selector(webState:didSubmitDocumentWithFormNamed:userInitiated:);
|
| if ([observer_ respondsToSelector:selector]) {
|
| - [observer_ documentSubmitted:web_state()
|
| - formName:form_name
|
| - userInteraction:user_interaction];
|
| + [observer_ webState:web_state()
|
| + didSubmitDocumentWithFormNamed:form_name
|
| + userInitiated:user_initiated];
|
| }
|
| }
|
|
|
| @@ -37,20 +65,47 @@ void WebStateObserverBridge::FormActivityRegistered(
|
| const std::string& type,
|
| const std::string& value,
|
| int key_code,
|
| - bool error) {
|
| - SEL selector =
|
| - @selector(formActivity:formName:fieldName:type:value:keyCode:error:);
|
| + bool input_missing) {
|
| + SEL selector = @selector(webState:
|
| + didRegisterFormActivityWithFormNamed:
|
| + fieldName:
|
| + type:
|
| + value:
|
| + keyCode:
|
| + inputMissing:);
|
| if ([observer_ respondsToSelector:selector]) {
|
| - [observer_ formActivity:web_state()
|
| - formName:form_name
|
| - fieldName:field_name
|
| - type:type
|
| - value:value
|
| - keyCode:key_code
|
| - error:error];
|
| + [observer_ webState:web_state()
|
| + didRegisterFormActivityWithFormNamed:form_name
|
| + fieldName:field_name
|
| + type:type
|
| + value:value
|
| + keyCode:key_code
|
| + inputMissing:input_missing];
|
| }
|
| }
|
|
|
| +void WebStateObserverBridge::AutocompleteRequested(const GURL& source_url,
|
| + const std::string& form_name,
|
| + bool user_initiated) {
|
| + SEL selector = @selector(webState:
|
| + requestAutocompleteForFormNamed:
|
| + sourceURL:
|
| + userInitiated:);
|
| + if ([observer_ respondsToSelector:selector]) {
|
| + [observer_ webState:web_state()
|
| + requestAutocompleteForFormNamed:form_name
|
| + sourceURL:source_url
|
| + userInitiated:user_initiated];
|
| + }
|
| +}
|
| +
|
| +void WebStateObserverBridge::FaviconUrlUpdated(
|
| + const std::vector<FaviconURL>& candidates) {
|
| + SEL selector = @selector(webState:didUpdateFaviconURLCandidates:);
|
| + if ([observer_ respondsToSelector:selector])
|
| + [observer_ webState:web_state() didUpdateFaviconURLCandidates:candidates];
|
| +}
|
| +
|
| void WebStateObserverBridge::WebStateDestroyed() {
|
| SEL selector = @selector(webStateDestroyed:);
|
| if ([observer_ respondsToSelector:selector]) {
|
|
|