| 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 13 matching lines...) Expand all Loading... |
| 24 #include "chrome/browser/ui/browser_finder.h" | 24 #include "chrome/browser/ui/browser_finder.h" |
| 25 #include "chrome/browser/ui/browser_instant_controller.h" | 25 #include "chrome/browser/ui/browser_instant_controller.h" |
| 26 #include "chrome/browser/ui/browser_tab_contents.h" | 26 #include "chrome/browser/ui/browser_tab_contents.h" |
| 27 #include "chrome/browser/ui/browser_window.h" | 27 #include "chrome/browser/ui/browser_window.h" |
| 28 #include "chrome/browser/ui/host_desktop.h" | 28 #include "chrome/browser/ui/host_desktop.h" |
| 29 #include "chrome/browser/ui/omnibox/location_bar.h" | 29 #include "chrome/browser/ui/omnibox/location_bar.h" |
| 30 #include "chrome/browser/ui/singleton_tabs.h" | 30 #include "chrome/browser/ui/singleton_tabs.h" |
| 31 #include "chrome/browser/ui/status_bubble.h" | 31 #include "chrome/browser/ui/status_bubble.h" |
| 32 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 32 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 33 #include "chrome/browser/web_applications/web_app.h" | 33 #include "chrome/browser/web_applications/web_app.h" |
| 34 #include "chrome/common/extensions/extension.h" | |
| 35 #include "chrome/common/pref_names.h" | 34 #include "chrome/common/pref_names.h" |
| 36 #include "chrome/common/url_constants.h" | 35 #include "chrome/common/url_constants.h" |
| 37 #include "content/public/browser/browser_url_handler.h" | 36 #include "content/public/browser/browser_url_handler.h" |
| 38 #include "content/public/browser/notification_service.h" | 37 #include "content/public/browser/notification_service.h" |
| 39 #include "content/public/browser/render_view_host.h" | 38 #include "content/public/browser/render_view_host.h" |
| 40 #include "content/public/browser/web_contents.h" | 39 #include "content/public/browser/web_contents.h" |
| 41 #include "content/public/browser/web_contents_view.h" | 40 #include "content/public/browser/web_contents_view.h" |
| 41 #include "extensions/common/extension.h" |
| 42 | 42 |
| 43 #if defined(USE_AURA) | 43 #if defined(USE_AURA) |
| 44 #include "ui/aura/window.h" | 44 #include "ui/aura/window.h" |
| 45 #endif | 45 #endif |
| 46 | 46 |
| 47 using content::GlobalRequestID; | 47 using content::GlobalRequestID; |
| 48 using content::NavigationController; | 48 using content::NavigationController; |
| 49 using content::WebContents; | 49 using content::WebContents; |
| 50 | 50 |
| 51 class BrowserNavigatorWebContentsAdoption { | 51 class BrowserNavigatorWebContentsAdoption { |
| (...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 701 bool reverse_on_redirect = false; | 701 bool reverse_on_redirect = false; |
| 702 content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary( | 702 content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary( |
| 703 &rewritten_url, browser_context, &reverse_on_redirect); | 703 &rewritten_url, browser_context, &reverse_on_redirect); |
| 704 | 704 |
| 705 // Some URLs are mapped to uber subpages. Do not allow them in incognito. | 705 // Some URLs are mapped to uber subpages. Do not allow them in incognito. |
| 706 return !(rewritten_url.scheme() == chrome::kChromeUIScheme && | 706 return !(rewritten_url.scheme() == chrome::kChromeUIScheme && |
| 707 rewritten_url.host() == chrome::kChromeUIUberHost); | 707 rewritten_url.host() == chrome::kChromeUIUberHost); |
| 708 } | 708 } |
| 709 | 709 |
| 710 } // namespace chrome | 710 } // namespace chrome |
| OLD | NEW |