Reading List: Mark entry read when opening external app.

ios/chrome/browser/tabs/tab.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/tabs/tab.h"
 
 #import <CoreLocation/CoreLocation.h>
 #import <UIKit/UIKit.h>
 
 #include <utility>
@@ skipping 50 matching lines @@
 #import "ios/chrome/browser/geolocation/omnibox_geolocation_controller.h"
 #include "ios/chrome/browser/history/history_service_factory.h"
 #include "ios/chrome/browser/history/top_sites_factory.h"
 #include "ios/chrome/browser/infobars/infobar_manager_impl.h"
 #include "ios/chrome/browser/metrics/ios_chrome_origins_seen_service_factory.h"
 #import "ios/chrome/browser/metrics/tab_usage_recorder.h"
 #import "ios/chrome/browser/native_app_launcher/native_app_navigation_controller.h"
 #import "ios/chrome/browser/passwords/password_controller.h"
 #import "ios/chrome/browser/passwords/passwords_ui_delegate_impl.h"
 #include "ios/chrome/browser/pref_names.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_session_tab_helper.h"
 #include "ios/chrome/browser/signin/account_consistency_service_factory.h"
 #include "ios/chrome/browser/signin/account_reconcilor_factory.h"
 #include "ios/chrome/browser/signin/authentication_service.h"
 #include "ios/chrome/browser/signin/authentication_service_factory.h"
 #include "ios/chrome/browser/signin/signin_capability.h"
 #import "ios/chrome/browser/snapshots/snapshot_manager.h"
 #import "ios/chrome/browser/snapshots/snapshot_overlay_provider.h"
 #import "ios/chrome/browser/snapshots/web_controller_snapshot_helper.h"
@@ skipping 259 matching lines @@
 
 // Adds any cached entries from |addPageVector_| to the history DB.
 - (void)commitCachedEntriesToHistoryDB;
 
 // Returns the OpenInController for this tab.
 - (OpenInController*)openInController;
 
 // Initialize the Native App Launcher controller.
 - (void)initNativeAppNavigationController;
 
-// Opens a link in an external app. Returns YES iff |url| is launched in an
-// external app.
-- (BOOL)openExternalURL:(const GURL&)url linkClicked:(BOOL)linkClicked;
+//// Opens a link in an external app. Returns YES iff |url| is launched in an
+//// external app.

[jif, 2017/03/30 09:05:56]

s/////////

[Olivier, 2017/03/30 15:45:04]

This is removed

+//- (BOOL)openExternalURL:(const GURL&)url linkClicked:(BOOL)linkClicked;

[Eugene But (OOO till 7-30), 2017/03/29 19:56:13]

Looks like this is redefinition of CRWWebDelegate method. The issue is that
CRWWebDelegate methods are not named like delegate methods, hence the collision.
Both Tab and CRWWebDelegate will be removed, so you can just remove this
predeclaration.

[Olivier, 2017/03/30 15:45:04]

Done.

 
 // Handles exportable files if possible.
 - (void)handleExportableFile:(net::HttpResponseHeaders*)headers;
 
 // Called after the session history is replaced, useful for updating members
 // with new sessionID.
 - (void)didReplaceSessionHistory;
 
 // Called when the UIApplication's state becomes active.
 - (void)applicationDidBecomeActive;
@@ skipping 894 matching lines @@
 
   if (self.navigationManager) {
     CRWSessionController* sessionController =
         [self navigationManagerImpl]->GetSessionController();
     NSInteger itemIndex = [sessionController indexOfItem:item];
     DCHECK_NE(itemIndex, NSNotFound);
     self.navigationManager->GoToIndex(itemIndex);
   }
 }
 
-- (BOOL)openExternalURL:(const GURL&)url linkClicked:(BOOL)linkClicked {
+- (BOOL)openExternalURL:(const GURL&)url
+              sourceURL:(const GURL&)sourceURL
+            linkClicked:(BOOL)linkClicked {
   if (!externalAppLauncher_.get())
     externalAppLauncher_.reset([[ExternalAppLauncher alloc] init]);
 
   // This method may release CRWWebController which may cause a crash
   // (crbug.com/393949).
   [[self.webController retain] autorelease];
 
   // Make a local url copy for possible modification.
   GURL finalURL = url;
 
@@ skipping 26 matching lines @@
   }
 
   if ([externalAppLauncher_ openURL:finalURL linkClicked:linkClicked]) {
     // Clears pending navigation history after successfully launching the
     // external app.
     DCHECK([self navigationManager]);
     [self navigationManager]->DiscardNonCommittedItems();
     // Ensure the UI reflects the current entry, not the just-discarded pending
     // entry.
     [parentTabModel_ notifyTabChanged:self];
+
+    if (sourceURL.is_valid()) {
+      ReadingListModel* model =
+          ReadingListModelFactory::GetForBrowserState(browserState_);
+      if (model && model->loaded()) {
+        model->SetReadStatus(sourceURL, true);
+      }
+    }
+
     return YES;
   }
   return NO;
 }
 
+- (void)currentNavigationWillContinueInExternalApp {

[Eugene But (OOO till 7-30), 2017/03/29 19:56:13]

I guess you don't need this anymore

[Olivier, 2017/03/30 15:45:03]

Done.

+}
+
 - (void)webState:(web::WebState*)webState
     didFinishNavigation:(web::NavigationContext*)navigation {
   if (navigation->IsSameDocument()) {
     auto* faviconDriver = favicon::WebFaviconDriver::FromWebState(webState);
     if (faviconDriver) {
       // Fetch the favicon for the new URL.
       faviconDriver->FetchFavicon(navigation->GetUrl());
     }
   }
 
@@ skipping 410 matching lines @@
           nativeAppForURL:url] retain]);
   if (![metadata shouldAutoOpenLinks])
     return NO;
 
   AuthenticationService* authenticationService =
       AuthenticationServiceFactory::GetForBrowserState(self.browserState);
   ChromeIdentity* identity = authenticationService->GetAuthenticatedIdentity();
 
   // Attempts to open external app without x-callback.
   if ([self openExternalURL:[metadata launchURLWithURL:url identity:identity]
+                  sourceURL:sourceURL
                 linkClicked:linkClicked]) {
     return YES;
   }
 
   // Auto-open didn't work. Reset the auto-open flag.
   [metadata unsetShouldAutoOpenLinks];
   return NO;
 }
 
 - (double)lastVisitedTimestamp {
@@ skipping 328 matching lines @@
 
 - (TabModel*)parentTabModel {
   return parentTabModel_;
 }
 
 - (FormInputAccessoryViewController*)inputAccessoryViewController {
   return inputAccessoryViewController_.get();
 }
 
 @end