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

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

Issue 8930012: Revert 114236 - Options2: Pull the trigger. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/stringprintf.h" 10 #include "base/stringprintf.h"
(...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after
634 return -1; 634 return -1;
635 } 635 }
636 636
637 bool IsURLAllowedInIncognito(const GURL& url) { 637 bool IsURLAllowedInIncognito(const GURL& url) {
638 // Most URLs are allowed in incognito; the following are exceptions. 638 // Most URLs are allowed in incognito; the following are exceptions.
639 // chrome://extensions is on the list because it redirects to 639 // chrome://extensions is on the list because it redirects to
640 // chrome://settings. 640 // chrome://settings.
641 641
642 return !(url.scheme() == chrome::kChromeUIScheme && 642 return !(url.scheme() == chrome::kChromeUIScheme &&
643 (url.host() == chrome::kChromeUISettingsHost || 643 (url.host() == chrome::kChromeUISettingsHost ||
644 url.host() == chrome::kChromeUISettingsFrameHost ||
645 url.host() == chrome::kChromeUIExtensionsHost || 644 url.host() == chrome::kChromeUIExtensionsHost ||
646 url.host() == chrome::kChromeUIBookmarksHost || 645 url.host() == chrome::kChromeUIBookmarksHost ||
647 url.host() == chrome::kChromeUISyncPromoHost)); 646 url.host() == chrome::kChromeUISyncPromoHost));
648 } 647 }
649 648
650 } // namespace browser 649 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/resources/uber/uber.html ('k') | chrome/browser/ui/webui/chrome_web_ui_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698