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 621 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
632 #if defined(ENABLE_PLUGINS) | 632 #if defined(ENABLE_PLUGINS) |
633 void HandleFlashDownloadActionOnUIThread(int render_process_id, | 633 void HandleFlashDownloadActionOnUIThread(int render_process_id, |
634 int render_frame_id) { | 634 int render_frame_id) { |
635 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 635 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
636 RenderFrameHost* render_frame_host = | 636 RenderFrameHost* render_frame_host = |
637 RenderFrameHost::FromID(render_process_id, render_frame_id); | 637 RenderFrameHost::FromID(render_process_id, render_frame_id); |
638 if (!render_frame_host) | 638 if (!render_frame_host) |
639 return; | 639 return; |
640 WebContents* web_contents = | 640 WebContents* web_contents = |
641 WebContents::FromRenderFrameHost(render_frame_host); | 641 WebContents::FromRenderFrameHost(render_frame_host); |
642 FlashDownloadInterception::InterceptFlashDownloadNavigation(web_contents); | 642 FlashDownloadInterception::ShowRunFlashPrompt(web_contents); |
643 } | 643 } |
644 #endif // defined(ENABLE_PLUGINS) | 644 #endif // defined(ENABLE_PLUGINS) |
645 | 645 |
646 // An implementation of the SSLCertReporter interface used by | 646 // An implementation of the SSLCertReporter interface used by |
647 // SSLErrorHandler. Uses the SafeBrowsing UI manager to send invalid | 647 // SSLErrorHandler. Uses the SafeBrowsing UI manager to send invalid |
648 // certificate reports. | 648 // certificate reports. |
649 class SafeBrowsingSSLCertReporter : public SSLCertReporter { | 649 class SafeBrowsingSSLCertReporter : public SSLCertReporter { |
650 public: | 650 public: |
651 explicit SafeBrowsingSSLCertReporter( | 651 explicit SafeBrowsingSSLCertReporter( |
652 const scoped_refptr<safe_browsing::SafeBrowsingUIManager>& | 652 const scoped_refptr<safe_browsing::SafeBrowsingUIManager>& |
(...skipping 2608 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3261 if (channel <= kMaxDisableEncryptionChannel) { | 3261 if (channel <= kMaxDisableEncryptionChannel) { |
3262 static const char* const kWebRtcDevSwitchNames[] = { | 3262 static const char* const kWebRtcDevSwitchNames[] = { |
3263 switches::kDisableWebRtcEncryption, | 3263 switches::kDisableWebRtcEncryption, |
3264 }; | 3264 }; |
3265 to_command_line->CopySwitchesFrom(from_command_line, | 3265 to_command_line->CopySwitchesFrom(from_command_line, |
3266 kWebRtcDevSwitchNames, | 3266 kWebRtcDevSwitchNames, |
3267 arraysize(kWebRtcDevSwitchNames)); | 3267 arraysize(kWebRtcDevSwitchNames)); |
3268 } | 3268 } |
3269 } | 3269 } |
3270 #endif // defined(ENABLE_WEBRTC) | 3270 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |