| Index: ios/chrome/browser/ui/browser_view_controller.mm
|
| diff --git a/ios/chrome/browser/ui/browser_view_controller.mm b/ios/chrome/browser/ui/browser_view_controller.mm
|
| index 1c37fbc1a769f21af80830a4e505b8549a07ccd0..007184c7022045890650ed1ea3817b434df8c673 100644
|
| --- a/ios/chrome/browser/ui/browser_view_controller.mm
|
| +++ b/ios/chrome/browser/ui/browser_view_controller.mm
|
| @@ -272,12 +272,8 @@ enum HeaderBehaviour {
|
| const CGFloat kIPadFindBarOverlap = 11;
|
|
|
| bool IsURLAllowedInIncognito(const GURL& url) {
|
| - // Most URLs are allowed in incognito; the following are exceptions.
|
| - if (!url.SchemeIs(kChromeUIScheme))
|
| - return true;
|
| - std::string url_host = url.host();
|
| - return url_host != kChromeUIHistoryHost &&
|
| - url_host != kChromeUIHistoryFrameHost;
|
| + // Most URLs are allowed in incognito; the following is an exception.
|
| + return !(url.SchemeIs(kChromeUIScheme) && url.host() == kChromeUIHistoryHost);
|
| }
|
|
|
| // Temporary key to use when storing native controllers vended to tabs before
|
| @@ -3086,13 +3082,6 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
|
| DCHECK(![self hasControllerForURL:url]);
|
| // In any other case the PageNotAvailableController is returned.
|
| nativeController = [[PageNotAvailableController alloc] initWithUrl:url];
|
| - if (url_host == kChromeUIHistoryFrameHost) {
|
| - base::mac::ObjCCastStrict<PageNotAvailableController>(nativeController)
|
| - .descriptionText = l10n_util::GetNSStringFWithFixup(
|
| - IDS_IOS_HISTORY_URL_NOT_AVAILABLE,
|
| - base::UTF8ToUTF16(kChromeUIHistoryURL),
|
| - l10n_util::GetStringUTF16(IDS_HISTORY_SHOW_HISTORY));
|
| - }
|
| }
|
| // If a native controller is vended before its tab is added to the tab model,
|
| // use the temporary key and add it under the new tab's tabId in the
|
| @@ -3692,7 +3681,7 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
|
| }
|
|
|
| // NOTE: This check for the Crash Host URL is here to avoid the URL from
|
| - // ending up in the history causign the app to crash at every subsequent
|
| + // ending up in the history causing the app to crash at every subsequent
|
| // restart.
|
| if (url.host() == kChromeUIBrowserCrashHost) {
|
| [self induceBrowserCrash];
|
|
|