| 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 2860 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2871 } | 2871 } |
| 2872 | 2872 |
| 2873 - (void)didStartLoadingURL:(const GURL&)URL { | 2873 - (void)didStartLoadingURL:(const GURL&)URL { |
| 2874 _loadPhase = web::PAGE_LOADING; | 2874 _loadPhase = web::PAGE_LOADING; |
| 2875 _URLOnStartLoading = URL; | 2875 _URLOnStartLoading = URL; |
| 2876 _displayStateOnStartLoading = self.pageDisplayState; | 2876 _displayStateOnStartLoading = self.pageDisplayState; |
| 2877 | 2877 |
| 2878 self.userInteractionRegistered = NO; | 2878 self.userInteractionRegistered = NO; |
| 2879 _pageHasZoomed = NO; | 2879 _pageHasZoomed = NO; |
| 2880 | 2880 |
| 2881 [[self sessionController] commitPendingItem]; | 2881 self.navigationManagerImpl->CommitPendingItem(); |
| 2882 } | 2882 } |
| 2883 | 2883 |
| 2884 - (void)wasShown { | 2884 - (void)wasShown { |
| 2885 if ([self.nativeController respondsToSelector:@selector(wasShown)]) { | 2885 if ([self.nativeController respondsToSelector:@selector(wasShown)]) { |
| 2886 [self.nativeController wasShown]; | 2886 [self.nativeController wasShown]; |
| 2887 } | 2887 } |
| 2888 } | 2888 } |
| 2889 | 2889 |
| 2890 - (void)wasHidden { | 2890 - (void)wasHidden { |
| 2891 if (_isHalted) | 2891 if (_isHalted) |
| (...skipping 2340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5232 - (NSUInteger)observerCount { | 5232 - (NSUInteger)observerCount { |
| 5233 DCHECK_EQ(_observerBridges.size(), [_observers count]); | 5233 DCHECK_EQ(_observerBridges.size(), [_observers count]); |
| 5234 return [_observers count]; | 5234 return [_observers count]; |
| 5235 } | 5235 } |
| 5236 | 5236 |
| 5237 - (NSString*)referrerFromNavigationAction:(WKNavigationAction*)action { | 5237 - (NSString*)referrerFromNavigationAction:(WKNavigationAction*)action { |
| 5238 return [action.request valueForHTTPHeaderField:kReferrerHeaderName]; | 5238 return [action.request valueForHTTPHeaderField:kReferrerHeaderName]; |
| 5239 } | 5239 } |
| 5240 | 5240 |
| 5241 @end | 5241 @end |
| OLD | NEW |