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