diff options
| author | eugenebut <eugenebut@chromium.org> | 2015-10-19 16:30:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-19 23:31:30 +0000 |
| commit | ae48202d4464dbaa34f75c50ccb15a1f7a1dd557 (patch) | |
| tree | 2bc890e4d65c9a34d83187f321473594056a2f89 /ios | |
| parent | bd5f09eed76868c8aa00a9ab4fa66a9c72ccc6dc (diff) | |
| download | chromium_src-ae48202d4464dbaa34f75c50ccb15a1f7a1dd557.zip chromium_src-ae48202d4464dbaa34f75c50ccb15a1f7a1dd557.tar.gz chromium_src-ae48202d4464dbaa34f75c50ccb15a1f7a1dd557.tar.bz2 | |
WKWebView: fixed compilation on net-stack bot.
BUG=None
TBR=stuartmorgan@chromium.org
Review URL: https://codereview.chromium.org/1409793003
Cr-Commit-Position: refs/heads/master@{#354909}
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/web/web_state/ui/crw_wk_web_view_web_controller.mm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm b/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm index 726c477..ad627c8 100644 --- a/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm +++ b/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm @@ -249,6 +249,8 @@ WKWebViewErrorSource WKWebViewErrorSourceFromError(NSError* error) { // Clears all activity indicator tasks for this web controller. - (void)clearActivityIndicatorTasks; +#if !defined(ENABLE_CHROME_NET_STACK_FOR_WKWEBVIEW) + // Updates |security_style| and |cert_status| for the NavigationItem with ID // |navigationItemID|, if URL and certificate chain still match |host| and // |certChain|. @@ -264,7 +266,6 @@ WKWebViewErrorSource WKWebViewErrorSourceFromError(NSError* error) { - (void)scheduleSSLStatusUpdateUsingCertChain:(NSArray*)chain host:(NSString*)host; -#if !defined(ENABLE_CHROME_NET_STACK_FOR_WKWEBVIEW) // Updates SSL status for the current navigation item based on the information // provided by web view. - (void)updateSSLStatusForCurrentNavigationItem; @@ -883,6 +884,8 @@ WKWebViewErrorSource WKWebViewErrorSourceFromError(NSError* error) { clearNetworkTasksForGroup:[self activityIndicatorGroupID]]; } +#if !defined(ENABLE_CHROME_NET_STACK_FOR_WKWEBVIEW) + - (void)updateSSLStatusForNavigationItemWithID:(int)navigationItemID certChain:(NSArray*)chain host:(NSString*)host @@ -947,8 +950,6 @@ WKWebViewErrorSource WKWebViewErrorSourceFromError(NSError* error) { completionHandler:SSLStatusResponse]; } -#if !defined(ENABLE_CHROME_NET_STACK_FOR_WKWEBVIEW) - - (void)updateSSLStatusForCurrentNavigationItem { if ([self isBeingDestroyed]) return; |