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

Side by Side Diff: chrome/browser/ui/browser_navigator.cc

Issue 170743009: Revert of Adding the chrome://suggestions test page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
OLDNEW
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 719 matching lines...) Expand 10 before | Expand all | Expand 10 after
730 url.host() == chrome::kChromeUIBookmarksHost || 730 url.host() == chrome::kChromeUIBookmarksHost ||
731 #if defined(ENABLE_ENHANCED_BOOKMARKS) 731 #if defined(ENABLE_ENHANCED_BOOKMARKS)
732 url.host() == chrome::kChromeUIEnhancedBookmarksHost || 732 url.host() == chrome::kChromeUIEnhancedBookmarksHost ||
733 #endif 733 #endif
734 #if !defined(OS_CHROMEOS) 734 #if !defined(OS_CHROMEOS)
735 url.host() == chrome::kChromeUIChromeSigninHost || 735 url.host() == chrome::kChromeUIChromeSigninHost ||
736 #endif 736 #endif
737 url.host() == chrome::kChromeUIUberHost || 737 url.host() == chrome::kChromeUIUberHost ||
738 url.host() == chrome::kChromeUIThumbnailHost || 738 url.host() == chrome::kChromeUIThumbnailHost ||
739 url.host() == chrome::kChromeUIThumbnailHost2 || 739 url.host() == chrome::kChromeUIThumbnailHost2 ||
740 url.host() == chrome::kChromeUIThumbnailListHost || 740 url.host() == chrome::kChromeUIThumbnailListHost)) {
741 url.host() == chrome::kChromeUISuggestionsHost)) {
742 return false; 741 return false;
743 } 742 }
744 743
745 if (url.scheme() == chrome::kChromeSearchScheme && 744 if (url.scheme() == chrome::kChromeSearchScheme &&
746 (url.host() == chrome::kChromeUIThumbnailHost || 745 (url.host() == chrome::kChromeUIThumbnailHost ||
747 url.host() == chrome::kChromeUIThumbnailHost2 || 746 url.host() == chrome::kChromeUIThumbnailHost2 ||
748 url.host() == chrome::kChromeUIThumbnailListHost || 747 url.host() == chrome::kChromeUIThumbnailListHost)) {
749 url.host() == chrome::kChromeUISuggestionsHost)) {
750 return false; 748 return false;
751 } 749 }
752 750
753 GURL rewritten_url = url; 751 GURL rewritten_url = url;
754 bool reverse_on_redirect = false; 752 bool reverse_on_redirect = false;
755 content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary( 753 content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
756 &rewritten_url, browser_context, &reverse_on_redirect); 754 &rewritten_url, browser_context, &reverse_on_redirect);
757 755
758 // Some URLs are mapped to uber subpages. Do not allow them in incognito. 756 // Some URLs are mapped to uber subpages. Do not allow them in incognito.
759 return !(rewritten_url.scheme() == content::kChromeUIScheme && 757 return !(rewritten_url.scheme() == content::kChromeUIScheme &&
760 rewritten_url.host() == chrome::kChromeUIUberHost); 758 rewritten_url.host() == chrome::kChromeUIUberHost);
761 } 759 }
762 760
763 } // namespace chrome 761 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/search/suggestions/suggestions_source.cc ('k') | chrome/browser/ui/webui/ntp/thumbnail_list_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698