| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #include "chrome/browser/ui/browser_navigator.h" | 5 #include "chrome/browser/ui/browser_navigator.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 721 IsURLAllowedInIncognito(stripped_url, browser_context); | 721 IsURLAllowedInIncognito(stripped_url, browser_context); |
| 722 } | 722 } |
| 723 // Most URLs are allowed in incognito; the following are exceptions. | 723 // Most URLs are allowed in incognito; the following are exceptions. |
| 724 // chrome://extensions is on the list because it redirects to | 724 // chrome://extensions is on the list because it redirects to |
| 725 // chrome://settings. | 725 // chrome://settings. |
| 726 if (url.scheme() == content::kChromeUIScheme && | 726 if (url.scheme() == content::kChromeUIScheme && |
| 727 (url.host() == chrome::kChromeUISettingsHost || | 727 (url.host() == chrome::kChromeUISettingsHost || |
| 728 url.host() == chrome::kChromeUISettingsFrameHost || | 728 url.host() == chrome::kChromeUISettingsFrameHost || |
| 729 url.host() == chrome::kChromeUIExtensionsHost || | 729 url.host() == chrome::kChromeUIExtensionsHost || |
| 730 url.host() == chrome::kChromeUIBookmarksHost || | 730 url.host() == chrome::kChromeUIBookmarksHost || |
| 731 #if defined(ENABLE_ENHANCED_BOOKMARKS) | |
| 732 url.host() == chrome::kChromeUIEnhancedBookmarksHost || | |
| 733 #endif | |
| 734 #if !defined(OS_CHROMEOS) | 731 #if !defined(OS_CHROMEOS) |
| 735 url.host() == chrome::kChromeUIChromeSigninHost || | 732 url.host() == chrome::kChromeUIChromeSigninHost || |
| 736 #endif | 733 #endif |
| 737 url.host() == chrome::kChromeUIUberHost || | 734 url.host() == chrome::kChromeUIUberHost || |
| 738 url.host() == chrome::kChromeUIThumbnailHost || | 735 url.host() == chrome::kChromeUIThumbnailHost || |
| 739 url.host() == chrome::kChromeUIThumbnailHost2 || | 736 url.host() == chrome::kChromeUIThumbnailHost2 || |
| 740 url.host() == chrome::kChromeUIThumbnailListHost || | 737 url.host() == chrome::kChromeUIThumbnailListHost || |
| 741 url.host() == chrome::kChromeUISuggestionsHost)) { | 738 url.host() == chrome::kChromeUISuggestionsHost)) { |
| 742 return false; | 739 return false; |
| 743 } | 740 } |
| (...skipping 10 matching lines...) Expand all Loading... |
| 754 bool reverse_on_redirect = false; | 751 bool reverse_on_redirect = false; |
| 755 content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary( | 752 content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary( |
| 756 &rewritten_url, browser_context, &reverse_on_redirect); | 753 &rewritten_url, browser_context, &reverse_on_redirect); |
| 757 | 754 |
| 758 // Some URLs are mapped to uber subpages. Do not allow them in incognito. | 755 // Some URLs are mapped to uber subpages. Do not allow them in incognito. |
| 759 return !(rewritten_url.scheme() == content::kChromeUIScheme && | 756 return !(rewritten_url.scheme() == content::kChromeUIScheme && |
| 760 rewritten_url.host() == chrome::kChromeUIUberHost); | 757 rewritten_url.host() == chrome::kChromeUIUberHost); |
| 761 } | 758 } |
| 762 | 759 |
| 763 } // namespace chrome | 760 } // namespace chrome |
| OLD | NEW |