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

Unified Diff: chrome/browser/ui/browser_navigator.cc

Issue 2478573004: Convert GURL::{host,path} to GURL::{host_piece,path_piece} for ==. (Closed)
Patch Set: rebase to #431874 Created 4 years, 1 month 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 | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/extensions/hosted_app_browser_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_navigator.cc
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
index df7d5b134d20741ade79dec636a7d4eebc931fc2..75dee0c12af16ce1b38cea130d83db8b1888b7c8 100644
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -634,33 +634,33 @@ bool IsURLAllowedInIncognito(const GURL& url,
// chrome://extensions is on the list because it redirects to
// chrome://settings.
if (url.scheme() == content::kChromeUIScheme &&
- (url.host() == chrome::kChromeUISettingsHost ||
- url.host() == chrome::kChromeUIMdSettingsHost ||
- url.host() == chrome::kChromeUISettingsFrameHost ||
- url.host() == chrome::kChromeUIHelpHost ||
- url.host() == chrome::kChromeUIHistoryHost ||
- url.host() == chrome::kChromeUIExtensionsHost ||
- url.host() == chrome::kChromeUIBookmarksHost ||
+ (url.host_piece() == chrome::kChromeUISettingsHost ||
+ url.host_piece() == chrome::kChromeUIMdSettingsHost ||
+ url.host_piece() == chrome::kChromeUISettingsFrameHost ||
+ url.host_piece() == chrome::kChromeUIHelpHost ||
+ url.host_piece() == chrome::kChromeUIHistoryHost ||
+ url.host_piece() == chrome::kChromeUIExtensionsHost ||
+ url.host_piece() == chrome::kChromeUIBookmarksHost ||
#if !defined(OS_CHROMEOS)
- url.host() == chrome::kChromeUIChromeSigninHost ||
+ url.host_piece() == chrome::kChromeUIChromeSigninHost ||
#endif
- url.host() == chrome::kChromeUIUberHost ||
- url.host() == chrome::kChromeUIThumbnailHost ||
- url.host() == chrome::kChromeUIThumbnailHost2 ||
- url.host() == chrome::kChromeUIThumbnailListHost ||
- url.host() == chrome::kChromeUISuggestionsHost ||
+ url.host_piece() == chrome::kChromeUIUberHost ||
+ url.host_piece() == chrome::kChromeUIThumbnailHost ||
+ url.host_piece() == chrome::kChromeUIThumbnailHost2 ||
+ url.host_piece() == chrome::kChromeUIThumbnailListHost ||
+ url.host_piece() == chrome::kChromeUISuggestionsHost ||
#if defined(OS_CHROMEOS)
- url.host() == chrome::kChromeUIVoiceSearchHost ||
+ url.host_piece() == chrome::kChromeUIVoiceSearchHost ||
#endif
- url.host() == chrome::kChromeUIDevicesHost)) {
+ url.host_piece() == chrome::kChromeUIDevicesHost)) {
return false;
}
if (url.scheme() == chrome::kChromeSearchScheme &&
- (url.host() == chrome::kChromeUIThumbnailHost ||
- url.host() == chrome::kChromeUIThumbnailHost2 ||
- url.host() == chrome::kChromeUIThumbnailListHost ||
- url.host() == chrome::kChromeUISuggestionsHost)) {
+ (url.host_piece() == chrome::kChromeUIThumbnailHost ||
+ url.host_piece() == chrome::kChromeUIThumbnailHost2 ||
+ url.host_piece() == chrome::kChromeUIThumbnailListHost ||
+ url.host_piece() == chrome::kChromeUISuggestionsHost)) {
return false;
}
@@ -670,8 +670,8 @@ bool IsURLAllowedInIncognito(const GURL& url,
&rewritten_url, browser_context, &reverse_on_redirect);
// Some URLs are mapped to uber subpages. Do not allow them in incognito.
- return !(rewritten_url.scheme() == content::kChromeUIScheme &&
- rewritten_url.host() == chrome::kChromeUIUberHost);
+ return !(rewritten_url.scheme_piece() == content::kChromeUIScheme &&
+ rewritten_url.host_piece() == chrome::kChromeUIUberHost);
}
} // namespace chrome
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/extensions/hosted_app_browser_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698