| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/web_state/ui/crw_web_controller.h" | 5 #import "ios/web/web_state/ui/crw_web_controller.h" |
| 6 | 6 |
| 7 #import <WebKit/WebKit.h> | 7 #import <WebKit/WebKit.h> |
| 8 | 8 |
| 9 #import <objc/runtime.h> | 9 #import <objc/runtime.h> |
| 10 #include <stddef.h> | 10 #include <stddef.h> |
| (...skipping 2387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2398 if (lastNavigationItem) { | 2398 if (lastNavigationItem) { |
| 2399 web::WKBackForwardListItemHolder* holder = | 2399 web::WKBackForwardListItemHolder* holder = |
| 2400 web::WKBackForwardListItemHolder::FromNavigationItem( | 2400 web::WKBackForwardListItemHolder::FromNavigationItem( |
| 2401 lastNavigationItem); | 2401 lastNavigationItem); |
| 2402 DCHECK(holder); | 2402 DCHECK(holder); |
| 2403 holder->set_back_forward_list_item(nil); | 2403 holder->set_back_forward_list_item(nil); |
| 2404 } | 2404 } |
| 2405 } | 2405 } |
| 2406 | 2406 |
| 2407 [self restoreStateFromHistory]; | 2407 [self restoreStateFromHistory]; |
| 2408 _webStateImpl->SetIsLoading(false); |
| 2408 _webStateImpl->OnPageLoaded(currentURL, loadSuccess); | 2409 _webStateImpl->OnPageLoaded(currentURL, loadSuccess); |
| 2409 _webStateImpl->SetIsLoading(false); | |
| 2410 // Inform the embedder the load completed. | |
| 2411 [_delegate webDidFinishWithURL:currentURL loadSuccess:loadSuccess]; | |
| 2412 } | 2410 } |
| 2413 | 2411 |
| 2414 - (void)goDelta:(int)delta { | 2412 - (void)goDelta:(int)delta { |
| 2415 if (_isBeingDestroyed) | 2413 if (_isBeingDestroyed) |
| 2416 return; | 2414 return; |
| 2417 | 2415 |
| 2418 if (delta == 0) { | 2416 if (delta == 0) { |
| 2419 [self reload]; | 2417 [self reload]; |
| 2420 return; | 2418 return; |
| 2421 } | 2419 } |
| (...skipping 3348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5770 } | 5768 } |
| 5771 | 5769 |
| 5772 return web::WEB_VIEW_DOCUMENT_TYPE_GENERIC; | 5770 return web::WEB_VIEW_DOCUMENT_TYPE_GENERIC; |
| 5773 } | 5771 } |
| 5774 | 5772 |
| 5775 - (NSString*)refererFromNavigationAction:(WKNavigationAction*)action { | 5773 - (NSString*)refererFromNavigationAction:(WKNavigationAction*)action { |
| 5776 return [action.request valueForHTTPHeaderField:@"Referer"]; | 5774 return [action.request valueForHTTPHeaderField:@"Referer"]; |
| 5777 } | 5775 } |
| 5778 | 5776 |
| 5779 @end | 5777 @end |
| OLD | NEW |