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 17 matching lines...) Expand all Loading... |
28 #include "chrome/browser/ui/singleton_tabs.h" | 28 #include "chrome/browser/ui/singleton_tabs.h" |
29 #include "chrome/browser/ui/status_bubble.h" | 29 #include "chrome/browser/ui/status_bubble.h" |
30 #include "chrome/browser/ui/tab_helpers.h" | 30 #include "chrome/browser/ui/tab_helpers.h" |
31 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 31 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
32 #include "chrome/common/url_constants.h" | 32 #include "chrome/common/url_constants.h" |
33 #include "content/public/browser/browser_url_handler.h" | 33 #include "content/public/browser/browser_url_handler.h" |
34 #include "content/public/browser/navigation_entry.h" | 34 #include "content/public/browser/navigation_entry.h" |
35 #include "content/public/browser/notification_service.h" | 35 #include "content/public/browser/notification_service.h" |
36 #include "content/public/browser/render_view_host.h" | 36 #include "content/public/browser/render_view_host.h" |
37 #include "content/public/browser/web_contents.h" | 37 #include "content/public/browser/web_contents.h" |
| 38 #include "ui/gfx/host_desktop_type.h" |
38 | 39 |
39 #if defined(USE_ASH) | 40 #if defined(USE_ASH) |
40 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" | 41 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" |
41 #endif | 42 #endif |
42 | 43 |
43 #if defined(USE_AURA) | 44 #if defined(USE_AURA) |
44 #include "ui/aura/window.h" | 45 #include "ui/aura/window.h" |
45 #endif | 46 #endif |
46 | 47 |
47 #if defined(ENABLE_EXTENSIONS) | 48 #if defined(ENABLE_EXTENSIONS) |
(...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
756 bool reverse_on_redirect = false; | 757 bool reverse_on_redirect = false; |
757 content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary( | 758 content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary( |
758 &rewritten_url, browser_context, &reverse_on_redirect); | 759 &rewritten_url, browser_context, &reverse_on_redirect); |
759 | 760 |
760 // Some URLs are mapped to uber subpages. Do not allow them in incognito. | 761 // Some URLs are mapped to uber subpages. Do not allow them in incognito. |
761 return !(rewritten_url.scheme() == content::kChromeUIScheme && | 762 return !(rewritten_url.scheme() == content::kChromeUIScheme && |
762 rewritten_url.host() == chrome::kChromeUIUberHost); | 763 rewritten_url.host() == chrome::kChromeUIUberHost); |
763 } | 764 } |
764 | 765 |
765 } // namespace chrome | 766 } // namespace chrome |
OLD | NEW |