Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(269)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2385033002: Hookup the plugin placeholder to the Flash permission prompt (Closed)
Patch Set: Hookup the plugin placeholder to the Flash permission prompt Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/engagement/site_engagement_score.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 624 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 #if defined(ENABLE_PLUGINS) 635 #if defined(ENABLE_PLUGINS)
636 void HandleFlashDownloadActionOnUIThread(int render_process_id, 636 void HandleFlashDownloadActionOnUIThread(int render_process_id,
637 int render_frame_id) { 637 int render_frame_id) {
638 DCHECK_CURRENTLY_ON(BrowserThread::UI); 638 DCHECK_CURRENTLY_ON(BrowserThread::UI);
639 RenderFrameHost* render_frame_host = 639 RenderFrameHost* render_frame_host =
640 RenderFrameHost::FromID(render_process_id, render_frame_id); 640 RenderFrameHost::FromID(render_process_id, render_frame_id);
641 if (!render_frame_host) 641 if (!render_frame_host)
642 return; 642 return;
643 WebContents* web_contents = 643 WebContents* web_contents =
644 WebContents::FromRenderFrameHost(render_frame_host); 644 WebContents::FromRenderFrameHost(render_frame_host);
645 FlashDownloadInterception::InterceptFlashDownloadNavigation(web_contents); 645 FlashDownloadInterception::ShowRunFlashPrompt(web_contents);
646 } 646 }
647 #endif // defined(ENABLE_PLUGINS) 647 #endif // defined(ENABLE_PLUGINS)
648 648
649 // An implementation of the SSLCertReporter interface used by 649 // An implementation of the SSLCertReporter interface used by
650 // SSLErrorHandler. Uses the SafeBrowsing UI manager to send invalid 650 // SSLErrorHandler. Uses the SafeBrowsing UI manager to send invalid
651 // certificate reports. 651 // certificate reports.
652 class SafeBrowsingSSLCertReporter : public SSLCertReporter { 652 class SafeBrowsingSSLCertReporter : public SSLCertReporter {
653 public: 653 public:
654 explicit SafeBrowsingSSLCertReporter( 654 explicit SafeBrowsingSSLCertReporter(
655 const scoped_refptr<safe_browsing::SafeBrowsingUIManager>& 655 const scoped_refptr<safe_browsing::SafeBrowsingUIManager>&
(...skipping 2621 matching lines...) Expand 10 before | Expand all | Expand 10 after
3277 if (channel <= kMaxDisableEncryptionChannel) { 3277 if (channel <= kMaxDisableEncryptionChannel) {
3278 static const char* const kWebRtcDevSwitchNames[] = { 3278 static const char* const kWebRtcDevSwitchNames[] = {
3279 switches::kDisableWebRtcEncryption, 3279 switches::kDisableWebRtcEncryption,
3280 }; 3280 };
3281 to_command_line->CopySwitchesFrom(from_command_line, 3281 to_command_line->CopySwitchesFrom(from_command_line,
3282 kWebRtcDevSwitchNames, 3282 kWebRtcDevSwitchNames,
3283 arraysize(kWebRtcDevSwitchNames)); 3283 arraysize(kWebRtcDevSwitchNames));
3284 } 3284 }
3285 } 3285 }
3286 #endif // defined(ENABLE_WEBRTC) 3286 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/engagement/site_engagement_score.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698