Showing previews UI for Offline Previews

chrome/browser/android/offline_pages/offline_page_tab_helper.cc

Index: chrome/browser/android/offline_pages/offline_page_tab_helper.cc
diff --git a/chrome/browser/android/offline_pages/offline_page_tab_helper.cc b/chrome/browser/android/offline_pages/offline_page_tab_helper.cc
index 9968ee6b77424996c98bbd021da094475c578c89..e332b6bb1e93e8e90dfc5402019a2b9fe54003ba 100644
--- a/chrome/browser/android/offline_pages/offline_page_tab_helper.cc
+++ b/chrome/browser/android/offline_pages/offline_page_tab_helper.cc
@@ -2,106 +2,99 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/offline_pages/offline_page_tab_helper.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/android/offline_pages/offline_page_request_job.h"
 #include "chrome/browser/android/offline_pages/offline_page_utils.h"
+#include "chrome/browser/loader/chrome_navigation_data.h"
+#include "chrome/browser/previews/previews_infobar_tab_helper.h"
+#include "components/offline_pages/loaded_offline_page_info.h"
 #include "components/offline_pages/offline_page_item.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/page_transition_types.h"
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(offline_pages::OfflinePageTabHelper);
 
 namespace offline_pages {
 
-OfflinePageTabHelper::LoadedOfflinePageInfo::LoadedOfflinePageInfo() {}
-
-OfflinePageTabHelper::LoadedOfflinePageInfo::~LoadedOfflinePageInfo() {}
-
-void OfflinePageTabHelper::LoadedOfflinePageInfo::Clear() {
-  offline_page.reset();
-  offline_header.Clear();
-  is_offline_preview = false;
-}
-
 OfflinePageTabHelper::OfflinePageTabHelper(content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       weak_ptr_factory_(this) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 }
 
 OfflinePageTabHelper::~OfflinePageTabHelper() {}
 
 void OfflinePageTabHelper::DidStartNavigation(
     content::NavigationHandle* navigation_handle) {
   // Skips non-main frame.
   if (!navigation_handle->IsInMainFrame())
     return;
 
   // This is a new navigation so we can invalidate any previously scheduled
   // operations.
   weak_ptr_factory_.InvalidateWeakPtrs();
   reloading_url_on_net_error_ = false;
 
-  // The provisional offline info can be cleared no matter how.
-  provisional_offline_info_.Clear();
-
   // If not a fragment navigation, clear the cached offline info.
-  if (offline_info_.offline_page.get()) {
+  if (offline_info_ && offline_info_->offline_page()) {
     GURL::Replacements remove_params;
     remove_params.ClearRef();
     GURL offline_url =
-        offline_info_.offline_page->url.ReplaceComponents(remove_params);
+        offline_info_->offline_page()->url.ReplaceComponents(remove_params);
     GURL navigated_url =
         navigation_handle->GetURL().ReplaceComponents(remove_params);
 
     if (offline_url != navigated_url)
-      offline_info_.Clear();
+      offline_info_.reset();
   }
 }
 
 void OfflinePageTabHelper::DidFinishNavigation(
     content::NavigationHandle* navigation_handle) {
   // Skips non-main frame.
   if (!navigation_handle->IsInMainFrame())
     return;
 
   if (!navigation_handle->HasCommitted())
     return;
 
   if (navigation_handle->IsSamePage())
     return;
 
   GURL navigated_url = navigation_handle->GetURL();
   if (navigation_handle->IsErrorPage()) {
-    offline_info_.Clear();
+    offline_info_.reset();
   } else {
-    // The provisional offline info can now be committed if the navigation is
-    // done without error.
-    DCHECK(!provisional_offline_info_.offline_page ||
-      navigated_url == provisional_offline_info_.offline_page->url);
-    offline_info_.offline_page =
-        std::move(provisional_offline_info_.offline_page);
-    offline_info_.offline_header = provisional_offline_info_.offline_header;
-    offline_info_.is_offline_preview =
-        provisional_offline_info_.is_offline_preview;
+    // The NavigationHandle's offline info can now be copied if the navigation
+    // is done without error.
+    ChromeNavigationData* chrome_navigation_data =
+        ChromeNavigationData::GetForNavigationHandle(navigation_handle);
+    if (chrome_navigation_data) {
+      LoadedOfflinePageInfo* info =
+          chrome_navigation_data->GetLoadedOfflinePageInfo();
+      if (info) {
+        DCHECK(!info->offline_page() ||
+               navigated_url == info->offline_page()->url);
+        offline_info_ = info->DeepCopy();
+      }
+    }
   }
-  provisional_offline_info_.Clear();
 
   // We might be reloading the URL in order to fetch the offline page.
   // * If successful, nothing to do.
   // * Otherwise, we're hitting error again. Bail out to avoid loop.
   if (reloading_url_on_net_error_)
     return;
 
   // When the navigation starts, the request might be intercepted to serve the
   // offline content if the network is detected to be in disconnected or poor
   // conditions. This detection might not work for some cases, i.e., connected
@@ -154,27 +147,11 @@ void OfflinePageTabHelper::SelectPageForOnlineURLDone(
 
   // Reloads the page with extra header set to force loading the offline page.
   content::NavigationController::LoadURLParams load_params(offline_page->url);
   load_params.transition_type = ui::PAGE_TRANSITION_RELOAD;
   OfflinePageHeader offline_header;
   offline_header.reason = OfflinePageHeader::Reason::NET_ERROR;
   load_params.extra_headers = offline_header.GetCompleteHeaderString();
   web_contents()->GetController().LoadURLWithParams(load_params);
 }
 
-// This is a callback from network request interceptor. It happens between
-// DidStartNavigation and DidFinishNavigation calls on this tab helper.
-void OfflinePageTabHelper::SetOfflinePage(
-    const OfflinePageItem& offline_page,
-    const OfflinePageHeader& offline_header,
-    bool is_offline_preview) {
-  provisional_offline_info_.offline_page =
-      base::MakeUnique<OfflinePageItem>(offline_page);
-  provisional_offline_info_.offline_header = offline_header;
-  provisional_offline_info_.is_offline_preview = is_offline_preview;
-}
-
-const OfflinePageItem* OfflinePageTabHelper::GetOfflinePageForTest() const {
-  return provisional_offline_info_.offline_page.get();
-}
-
 }  // namespace offline_pages