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

Unified Diff: ios/chrome/browser/tabs/tab.mm

Issue 2824543002: Remove usage of Tab's |url| property from Tab. (Closed)
Patch Set: eugene's comments Created 3 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/tabs/tab.mm
diff --git a/ios/chrome/browser/tabs/tab.mm b/ios/chrome/browser/tabs/tab.mm
index a86f1374b8835774493a7889dab9850cfed5bd95..ebede094dd0fdd03631114b465343fc450e47625 100644
--- a/ios/chrome/browser/tabs/tab.mm
+++ b/ios/chrome/browser/tabs/tab.mm
@@ -560,7 +560,7 @@ - (void)setParentTabModel:(TabModel*)model {
- (NSString*)description {
return [NSString stringWithFormat:@"%p ... %@ - %s", self, self.title,
- self.url.spec().c_str()];
+ self.visibleURL.spec().c_str()];
}
- (CRWWebController*)webController {
@@ -627,8 +627,8 @@ - (NSString*)originalTitle {
- (NSString*)urlDisplayString {
base::string16 urlText = url_formatter::FormatUrl(
- self.url, url_formatter::kFormatUrlOmitNothing, net::UnescapeRule::SPACES,
- nullptr, nullptr, nullptr);
+ self.visibleURL, url_formatter::kFormatUrlOmitNothing,
+ net::UnescapeRule::SPACES, nullptr, nullptr, nullptr);
return base::SysUTF16ToNSString(urlText);
}
@@ -661,7 +661,7 @@ - (NSString*)tabId {
}
- (void)fetchFavicon {
- const GURL& url = self.url;
+ const GURL& url = self.visibleURL;
if (!url.is_valid())
return;
@@ -844,7 +844,8 @@ - (void)saveTitleToHistoryDB {
ios::HistoryServiceFactory::GetForBrowserState(
_browserState, ServiceAccessType::IMPLICIT_ACCESS);
DCHECK(historyService);
- historyService->SetPageTitle(self.url, base::SysNSStringToUTF16(title));
+ historyService->SetPageTitle(self.lastCommittedURL,
+ base::SysNSStringToUTF16(title));
}
- (void)addCurrentEntryToHistoryDB {
@@ -1122,10 +1123,11 @@ - (BOOL)openExternalURL:(const GURL&)url
[self navigationManager]->GetLastCommittedItem()->GetURL().GetOrigin();
// Compose u2f-x-callback URL and update urlToOpen.
- finalURL = [_secondFactorController XCallbackFromRequestURL:finalURL
- originURL:origin
- tabURL:self.url
- tabID:self.tabId];
+ finalURL =
+ [_secondFactorController XCallbackFromRequestURL:finalURL
+ originURL:origin
+ tabURL:self.lastCommittedURL
+ tabID:self.tabId];
if (!finalURL.is_valid())
return NO;
@@ -1214,27 +1216,30 @@ - (void)handleExportableFile:(net::HttpResponseHeaders*)headers {
postNotificationName:kTabIsShowingExportableNotificationForCrashReporting
object:self];
// Try to generate a filename by first looking at |content_disposition_|, then
- // at the last component of |self.url| and if both of these fail use the
- // default filename "document".
+ // at the last component of |lastCommittedURL| and if both of these fail use
+ // the default filename "document".
std::string contentDisposition;
if (headers)
headers->GetNormalizedHeader("content-disposition", &contentDisposition);
std::string defaultFilename =
l10n_util::GetStringUTF8(IDS_IOS_OPEN_IN_FILE_DEFAULT_TITLE);
+ const GURL& committedURL = self.lastCommittedURL;
base::string16 filename =
- net::GetSuggestedFilename(self.url, contentDisposition,
+ net::GetSuggestedFilename(committedURL, contentDisposition,
"", // referrer-charset
"", // suggested-name
"application/pdf", // mime-type
defaultFilename);
[[self openInController]
- enableWithDocumentURL:self.url
+ enableWithDocumentURL:committedURL
suggestedFilename:base::SysUTF16ToNSString(filename)];
}
- (void)countMainFrameLoad {
- if ([self isPrerenderTab] || [self url].SchemeIs(kChromeUIScheme))
+ if ([self isPrerenderTab] ||
+ self.lastCommittedURL.SchemeIs(kChromeUIScheme)) {
return;
+ }
base::RecordAction(base::UserMetricsAction("MobilePageLoaded"));
}
@@ -1289,7 +1294,7 @@ - (void)loadReaderModeHTML:(NSString*)html forURL:(const GURL&)url {
// not changed since reader mode was requested. This could happen for example
// if the page does a late redirect itself or if the user tapped on a link and
// triggered reader mode before the page load is detected by webState.
- if (url == self.url)
+ if (url == self.lastCommittedURL)
[self.webController loadHTMLForCurrentURL:html];
[self.readerModeController exitReaderMode];
@@ -1390,7 +1395,8 @@ - (void)webWillAddPendingURL:(const GURL&)url
// into a NavigationManager observer callback, so it doesn't need to be
// checked in several places.
if (isUserNavigationEvent && !_isPrerenderTab &&
- ![self navigationManager]->GetPendingItem() && url != self.url) {
+ ![self navigationManager]->GetPendingItem() &&
+ url != self.lastCommittedURL) {
base::RecordAction(base::UserMetricsAction("MobileTabClobbered"));
if ([_parentTabModel tabUsageRecorder])
[_parentTabModel tabUsageRecorder]->RecordPageLoadStart(self);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698