[Reading List] Show page info for offline pages

ios/chrome/browser/ui/browser_view_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/chrome/browser/ui/browser_view_controller.h"
 
 #import <AssetsLibrary/AssetsLibrary.h>
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <PassKit/PassKit.h>
 #import <Photos/Photos.h>
@@ skipping 53 matching lines @@
 #import "ios/chrome/browser/geolocation/omnibox_geolocation_controller.h"
 #include "ios/chrome/browser/infobars/infobar_container_ios.h"
 #include "ios/chrome/browser/infobars/infobar_container_view.h"
 #import "ios/chrome/browser/metrics/new_tab_page_uma.h"
 #include "ios/chrome/browser/metrics/tab_usage_recorder.h"
 #import "ios/chrome/browser/native_app_launcher/native_app_navigation_controller.h"
 #import "ios/chrome/browser/open_url_util.h"
 #import "ios/chrome/browser/passwords/password_controller.h"
 #import "ios/chrome/browser/payments/payment_request_manager.h"
 #include "ios/chrome/browser/pref_names.h"
+#include "ios/chrome/browser/reading_list/offline_url_utils.h"
 #include "ios/chrome/browser/reading_list/reading_list_model_factory.h"
 #include "ios/chrome/browser/search_engines/template_url_service_factory.h"
 #include "ios/chrome/browser/sessions/ios_chrome_tab_restore_service_factory.h"
 #include "ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios.h"
 #include "ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios_factory.h"
 #import "ios/chrome/browser/snapshots/snapshot_cache.h"
 #import "ios/chrome/browser/snapshots/snapshot_overlay.h"
 #import "ios/chrome/browser/snapshots/snapshot_overlay_provider.h"
 #import "ios/chrome/browser/storekit_launcher.h"
 #import "ios/chrome/browser/tabs/legacy_tab_helper.h"
@@ skipping 3227 matching lines @@
   web::NavigationItem* navItem = [tab navigationManager]->GetVisibleItem();
 
   // It is fully expected to have a navItem here, as showPageInfoPopup can only
   // be trigerred by a button enabled when a current item matches some
   // conditions. However a crash was seen were navItem was NULL hence this
   // test after a DCHECK.
   DCHECK(navItem);
   if (!navItem)
     return;
 
-  // Don't show if the page is native.
-  if ([self isTabNativePage:tab])
+  // Don't show if the page is native except for offline pages (to show the
+  // offline page info).
+  if ([self isTabNativePage:tab] &&
+      !reading_list::IsOfflineURL(navItem->GetURL())) {
     return;
+  }
 
   // Don't show the bubble twice (this can happen when tapping very quickly in
   // accessibility mode).
   if (_pageInfoController)
     return;
 
   base::RecordAction(UserMetricsAction("MobileToolbarPageSecurityInfo"));
 
   // Dismiss the omnibox (if open).
   [_toolbarController cancelOmniboxEdit];
 
   [[NSNotificationCenter defaultCenter]
       postNotificationName:ios_internal::kPageInfoWillShowNotification
                     object:nil];
 
   // TODO(rohitrao): Get rid of PageInfoModel completely.
   PageInfoModelBubbleBridge* bridge = new PageInfoModelBubbleBridge();
   PageInfoModel* pageInfoModel = new PageInfoModel(
       _browserState, navItem->GetURL(), navItem->GetSSL(), bridge);

[kkhorimoto, 2017/03/01 18:43:53]

Are we sure we want to be able to show the PageInfo popover for reading list
NavigationItems?  It looks like the popover will be using the URL instead of the
virtual URL, which may be a jarring experience since the omnibox will be showing
a different URL than the info popover.  Additionally, it looks like this popover
is related to SSL status, which is not really relevant to reading list pages
since they're native pages loaded from files.

[kkhorimoto, 2017/03/01 18:46:42]

Actually Eugene showed me that there's already a separate info popover for
reading list that behaves correctly. lgtm!

 
   UIView* view = [self view];
   _pageInfoController.reset([[PageInfoViewController alloc]
       initWithModel:pageInfoModel
              bridge:bridge
         sourceFrame:[sourceView convertRect:[sourceView bounds] toView:view]
          parentView:view]);
   bridge->set_controller(_pageInfoController.get());
 }
 
@@ skipping 1668 matching lines @@
 
 - (UIView*)voiceSearchButton {
   return _voiceSearchButton;
 }
 
 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner {
   return [self currentLogoAnimationControllerOwner];
 }
 
 @end