Reload offline version on load failure

ios/web/web_state/ui/crw_web_controller.mm

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/web/web_state/ui/crw_web_controller.h"
 
 #import <WebKit/WebKit.h>
 
 #import <objc/runtime.h>
 #include <stddef.h>
@@ skipping 2011 matching lines @@
 
   // Initiating a navigation from the UI, record the current page state before
   // the new page loads. Don't record for back/forward, as the current entry
   // has already been moved to the next entry in the history. Do, however,
   // record it for general reload.
   // TODO(jimblackler): consider a single unified call to record state whenever
   // the page is about to be changed. This cannot currently be done after
   // addPendingEntry is called.
 
   [_delegate webWillInitiateLoadWithParams:params];
+  if ([self.nativeController respondsToSelector:@selector(willBeDismissed)]) {
+    [self.nativeController willBeDismissed];

[Eugene But (OOO till 7-30), 2016/12/19 17:52:32]

There are probably other cases when this needs to be called. Possibly
|goToItemAtIndex:|, and places where |clearTransientContentView| is called.

[Olivier, 2016/12/19 18:26:38]

Done.

+  }
 
   GURL navUrl = params.url;
   ui::PageTransition transition = params.transition_type;
 
   BOOL initialNavigation = NO;
   BOOL forwardBack =
       PageTransitionCoreTypeIs(transition, ui::PAGE_TRANSITION_RELOAD) &&
       (transition & ui::PAGE_TRANSITION_FORWARD_BACK);
   if (forwardBack) {
     // Setting these for back/forward is not supported.
@@ skipping 2003 matching lines @@
   // can be moved here, using public NavigationManager getters. That's not
   // done now in order to avoid code duplication.
   return [[self currentSessionEntry] navigationItem];
 }
 
 - (const GURL&)currentNavigationURL {
   // TODO(stuartmorgan): Fix the fact that this method doesn't have clear usage
   // delination that would allow changing to one of the non-deprecated URL
   // calls.
   web::NavigationItem* item = [self currentNavItem];
-  return item ? item->GetVirtualURL() : GURL::EmptyGURL();
+  return item ? item->GetURL() : GURL::EmptyGURL();
 }
 
 - (ui::PageTransition)currentTransition {
   if ([self currentNavItem])
     return [self currentNavItem]->GetTransitionType();
   else
     return ui::PageTransitionFromInt(0);
 }
 
 - (web::Referrer)currentSessionEntryReferrer {
@@ skipping 1726 matching lines @@
   }
 
   return web::WEB_VIEW_DOCUMENT_TYPE_GENERIC;
 }
 
 - (NSString*)refererFromNavigationAction:(WKNavigationAction*)action {
   return [action.request valueForHTTPHeaderField:@"Referer"];
 }
 
 @end