Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(88)

Side by Side Diff: ios/chrome/browser/tabs/tab.mm

Issue 2687343003: Fixed navigation for displayed SSL interstitials. (Closed)
Patch Set: Preserve old behavior of pending navigation index is disabled. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | ios/web/interstitials/web_interstitial_impl.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "ios/chrome/browser/tabs/tab.h" 5 #import "ios/chrome/browser/tabs/tab.h"
6 6
7 #import <CoreLocation/CoreLocation.h> 7 #import <CoreLocation/CoreLocation.h>
8 #import <UIKit/UIKit.h> 8 #import <UIKit/UIKit.h>
9 9
10 #include <utility> 10 #include <utility>
(...skipping 1796 matching lines...) Expand 10 before | Expand all | Expand 10 after
1807 } 1807 }
1808 1808
1809 - (void)webState:(web::WebState*)webState 1809 - (void)webState:(web::WebState*)webState
1810 didChangeLoadingProgress:(double)progress { 1810 didChangeLoadingProgress:(double)progress {
1811 // TODO(crbug.com/546406): It is probably possible to do something smarter, 1811 // TODO(crbug.com/546406): It is probably possible to do something smarter,
1812 // but the fact that this is not always sent will have to be taken into 1812 // but the fact that this is not always sent will have to be taken into
1813 // account. 1813 // account.
1814 [parentTabModel_ notifyTabChanged:self]; 1814 [parentTabModel_ notifyTabChanged:self];
1815 } 1815 }
1816 1816
1817 - (void)webStateDidDismissInterstitial:(web::WebState*)webState {
1818 [parentTabModel_ notifyTabChanged:self];
1819 }
1820
1817 - (void)webLoadCancelled:(const GURL&)url { 1821 - (void)webLoadCancelled:(const GURL&)url {
1818 // When a load is cancelled, this is the maximum that a page will ever load. 1822 // When a load is cancelled, this is the maximum that a page will ever load.
1819 [fullScreenController_ enableFullScreen]; 1823 [fullScreenController_ enableFullScreen];
1820 [parentTabModel_ notifyTabChanged:self]; 1824 [parentTabModel_ notifyTabChanged:self];
1821 } 1825 }
1822 1826
1823 - (BOOL)webController:(CRWWebController*)webController 1827 - (BOOL)webController:(CRWWebController*)webController
1824 shouldOpenExternalURL:(const GURL&)URL { 1828 shouldOpenExternalURL:(const GURL&)URL {
1825 if (isPrerenderTab_ && !isLinkLoadingPrerenderTab_) { 1829 if (isPrerenderTab_ && !isLinkLoadingPrerenderTab_) {
1826 [delegate_ discardPrerender]; 1830 [delegate_ discardPrerender];
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after
2233 2237
2234 - (TabModel*)parentTabModel { 2238 - (TabModel*)parentTabModel {
2235 return parentTabModel_; 2239 return parentTabModel_;
2236 } 2240 }
2237 2241
2238 - (FormInputAccessoryViewController*)inputAccessoryViewController { 2242 - (FormInputAccessoryViewController*)inputAccessoryViewController {
2239 return inputAccessoryViewController_.get(); 2243 return inputAccessoryViewController_.get();
2240 } 2244 }
2241 2245
2242 @end 2246 @end
OLDNEW
« no previous file with comments | « no previous file | ios/web/interstitials/web_interstitial_impl.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698