Load live version when reloading an offline page on connected network

chrome/browser/android/tab_android.cc

 // 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.
 
 #include "chrome/browser/android/tab_android.h"
 
 #include <stddef.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 50 matching lines @@
 #include "components/bookmarks/browser/bookmark_node.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/managed/managed_bookmark_service.h"
 #include "components/dom_distiller/core/url_utils.h"
 #include "components/favicon/content/content_favicon_driver.h"
 #include "components/navigation_interception/intercept_navigation_delegate.h"
 #include "components/navigation_interception/navigation_params.h"
 #include "components/offline_pages/offline_page_feature.h"
 #include "components/offline_pages/offline_page_item.h"
 #include "components/offline_pages/offline_page_model.h"
+#include "components/offline_pages/request_header/offline_page_header.h"
 #include "components/sessions/content/content_live_tab.h"
 #include "components/sessions/core/tab_restore_service.h"
 #include "components/url_formatter/url_fixer.h"
 #include "content/public/browser/android/compositor.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 730 matching lines @@
 
 void TabAndroid::ShowOfflinePages() {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_Tab_showOfflinePages(env, weak_java_tab_.get(env));
 }
 
 jboolean TabAndroid::IsOfflinePage(JNIEnv* env,
                                    const JavaParamRef<jobject>& obj) {
   return offline_pages::OfflinePageUtils::GetOfflinePageFromWebContents(
       web_contents()) != nullptr;
+  const offline_pages::OfflinePageItem* offline_page =

[Dmitry Titov, 2016/09/19 22:06:13]

This is unreachable code :) It might be not needed?

[jianli, 2016/09/19 22:26:06]

Removed line 820-821.

+      offline_pages::OfflinePageUtils::GetOfflinePageFromWebContents(
+          web_contents());
+  return offline_page && offline_page->url == GetURL();
 }
 
 ScopedJavaLocalRef<jobject> TabAndroid::GetOfflinePage(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   const offline_pages::OfflinePageItem* offline_page =
       offline_pages::OfflinePageUtils::GetOfflinePageFromWebContents(
           web_contents());
-  if (!offline_page)
+  if (!offline_page || offline_page->url != GetURL())
     return ScopedJavaLocalRef<jobject>();
 
   return offline_pages::android::OfflinePageBridge::ConvertToJavaOfflinePage(
       env, *offline_page);
 }
 
+ScopedJavaLocalRef<jstring> TabAndroid::GetOfflinePageHeaderForReload(

[Dmitry Titov, 2016/09/19 22:06:13]

+1 to what Ted said on moving this into OfflinePageUtil on java side...

[jianli, 2016/09/19 22:26:06]

Done.

+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& obj) {
+  const offline_pages::OfflinePageHeader* offline_header =
+      offline_pages::OfflinePageUtils::GetOfflineHeaderFromWebContents(
+          web_contents());
+  if (!offline_header)
+    return ScopedJavaLocalRef<jstring>();
+
+  // Only replaces the reason field with "reload" value that is used to trigger
+  // the network conditon check again in deciding whether to load the offline
+  // page. All other fields in the offline header should still carry to the
+  // reload request in order to keep the consistent behavior if we do decide to
+  // load the offline page. For example, "id" field should be kept in order to
+  // load the same offline version again if desired.
+  offline_pages::OfflinePageHeader offline_header_for_reload = *offline_header;
+  offline_header_for_reload.reason =
+      offline_pages::OfflinePageHeader::Reason::RELOAD;
+  return ScopedJavaLocalRef<jstring>(ConvertUTF8ToJavaString(
+      env, offline_header_for_reload.GetCompleteHeaderString()));
+}
+
 bool TabAndroid::HasPrerenderedUrl(JNIEnv* env,
                                    const JavaParamRef<jobject>& obj,
                                    const JavaParamRef<jstring>& url) {
   GURL gurl(base::android::ConvertJavaStringToUTF8(env, url));
   return HasPrerenderedUrl(gurl);
 }
 
 namespace {
 
 class ChromeInterceptNavigationDelegate : public InterceptNavigationDelegate {
@@ skipping 69 matching lines @@
 static void Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   TRACE_EVENT0("native", "TabAndroid::Init");
   // This will automatically bind to the Java object and pass ownership there.
   new TabAndroid(env, obj);
 }
 
 // static
 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }