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/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 2691 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2702 content::NavigationHandle* handle) { | 2702 content::NavigationHandle* handle) { |
2703 ScopedVector<content::NavigationThrottle> throttles; | 2703 ScopedVector<content::NavigationThrottle> throttles; |
2704 #if defined(OS_ANDROID) | 2704 #if defined(OS_ANDROID) |
2705 // TODO(davidben): This is insufficient to integrate with prerender properly. | 2705 // TODO(davidben): This is insufficient to integrate with prerender properly. |
2706 // https://crbug.com/370595 | 2706 // https://crbug.com/370595 |
2707 prerender::PrerenderContents* prerender_contents = | 2707 prerender::PrerenderContents* prerender_contents = |
2708 prerender::PrerenderContents::FromWebContents(handle->GetWebContents()); | 2708 prerender::PrerenderContents::FromWebContents(handle->GetWebContents()); |
2709 if (!prerender_contents && handle->IsInMainFrame()) { | 2709 if (!prerender_contents && handle->IsInMainFrame()) { |
2710 throttles.push_back( | 2710 throttles.push_back( |
2711 navigation_interception::InterceptNavigationDelegate::CreateThrottleFor( | 2711 navigation_interception::InterceptNavigationDelegate::CreateThrottleFor( |
2712 handle) | 2712 handle)); |
2713 .Pass()); | |
2714 } | 2713 } |
2715 #else | 2714 #else |
2716 if (handle->IsInMainFrame()) { | 2715 if (handle->IsInMainFrame()) { |
2717 // Redirect some navigations to apps that have registered matching URL | 2716 // Redirect some navigations to apps that have registered matching URL |
2718 // handlers ('url_handlers' in the manifest). | 2717 // handlers ('url_handlers' in the manifest). |
2719 scoped_ptr<content::NavigationThrottle> url_to_app_throttle = | 2718 scoped_ptr<content::NavigationThrottle> url_to_app_throttle = |
2720 AppUrlRedirector::MaybeCreateThrottleFor(handle); | 2719 AppUrlRedirector::MaybeCreateThrottleFor(handle); |
2721 if (url_to_app_throttle) | 2720 if (url_to_app_throttle) |
2722 throttles.push_back(std::move(url_to_app_throttle)); | 2721 throttles.push_back(std::move(url_to_app_throttle)); |
2723 } | 2722 } |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2811 if (channel <= kMaxDisableEncryptionChannel) { | 2810 if (channel <= kMaxDisableEncryptionChannel) { |
2812 static const char* const kWebRtcDevSwitchNames[] = { | 2811 static const char* const kWebRtcDevSwitchNames[] = { |
2813 switches::kDisableWebRtcEncryption, | 2812 switches::kDisableWebRtcEncryption, |
2814 }; | 2813 }; |
2815 to_command_line->CopySwitchesFrom(from_command_line, | 2814 to_command_line->CopySwitchesFrom(from_command_line, |
2816 kWebRtcDevSwitchNames, | 2815 kWebRtcDevSwitchNames, |
2817 arraysize(kWebRtcDevSwitchNames)); | 2816 arraysize(kWebRtcDevSwitchNames)); |
2818 } | 2817 } |
2819 } | 2818 } |
2820 #endif // defined(ENABLE_WEBRTC) | 2819 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |