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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 2961383002: Show a new placeholder for PDF's when plugins are disabled. (Closed)
Patch Set: . Created 3 years, 5 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 | « chrome/renderer/BUILD.gn ('k') | chrome/renderer/plugins/pdf_plugin_placeholder.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/renderer/chrome_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 #include "chrome/renderer/chrome_render_frame_observer.h" 44 #include "chrome/renderer/chrome_render_frame_observer.h"
45 #include "chrome/renderer/chrome_render_thread_observer.h" 45 #include "chrome/renderer/chrome_render_thread_observer.h"
46 #include "chrome/renderer/chrome_render_view_observer.h" 46 #include "chrome/renderer/chrome_render_view_observer.h"
47 #include "chrome/renderer/content_settings_observer.h" 47 #include "chrome/renderer/content_settings_observer.h"
48 #include "chrome/renderer/loadtimes_extension_bindings.h" 48 #include "chrome/renderer/loadtimes_extension_bindings.h"
49 #include "chrome/renderer/net/net_error_helper.h" 49 #include "chrome/renderer/net/net_error_helper.h"
50 #include "chrome/renderer/net_benchmarking_extension.h" 50 #include "chrome/renderer/net_benchmarking_extension.h"
51 #include "chrome/renderer/page_load_metrics/metrics_render_frame_observer.h" 51 #include "chrome/renderer/page_load_metrics/metrics_render_frame_observer.h"
52 #include "chrome/renderer/pepper/pepper_helper.h" 52 #include "chrome/renderer/pepper/pepper_helper.h"
53 #include "chrome/renderer/plugins/non_loadable_plugin_placeholder.h" 53 #include "chrome/renderer/plugins/non_loadable_plugin_placeholder.h"
54 #include "chrome/renderer/plugins/pdf_plugin_placeholder.h"
54 #include "chrome/renderer/plugins/plugin_preroller.h" 55 #include "chrome/renderer/plugins/plugin_preroller.h"
55 #include "chrome/renderer/plugins/plugin_uma.h" 56 #include "chrome/renderer/plugins/plugin_uma.h"
56 #include "chrome/renderer/prerender/prerender_dispatcher.h" 57 #include "chrome/renderer/prerender/prerender_dispatcher.h"
57 #include "chrome/renderer/prerender/prerender_helper.h" 58 #include "chrome/renderer/prerender/prerender_helper.h"
58 #include "chrome/renderer/prerender/prerenderer_client.h" 59 #include "chrome/renderer/prerender/prerenderer_client.h"
59 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h" 60 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
60 #include "chrome/renderer/safe_browsing/renderer_url_loader_throttle.h" 61 #include "chrome/renderer/safe_browsing/renderer_url_loader_throttle.h"
61 #include "chrome/renderer/searchbox/search_bouncer.h" 62 #include "chrome/renderer/searchbox/search_bouncer.h"
62 #include "chrome/renderer/searchbox/searchbox.h" 63 #include "chrome/renderer/searchbox/searchbox.h"
63 #include "chrome/renderer/searchbox/searchbox_extension.h" 64 #include "chrome/renderer/searchbox/searchbox_extension.h"
(...skipping 812 matching lines...) Expand 10 before | Expand all | Expand 10 after
876 // Same-origin and whitelisted-origin plugins skip the placeholder. 877 // Same-origin and whitelisted-origin plugins skip the placeholder.
877 return render_frame->CreatePlugin(info, params, nullptr); 878 return render_frame->CreatePlugin(info, params, nullptr);
878 } 879 }
879 case ChromeViewHostMsg_GetPluginInfo_Status::kDisabled: { 880 case ChromeViewHostMsg_GetPluginInfo_Status::kDisabled: {
880 PluginUMAReporter::GetInstance()->ReportPluginDisabled(orig_mime_type, 881 PluginUMAReporter::GetInstance()->ReportPluginDisabled(orig_mime_type,
881 url); 882 url);
882 if (info.name == 883 if (info.name ==
883 ASCIIToUTF16(ChromeContentClient::kPDFExtensionPluginName)) { 884 ASCIIToUTF16(ChromeContentClient::kPDFExtensionPluginName)) {
884 ReportPDFLoadStatus( 885 ReportPDFLoadStatus(
885 PDFLoadStatus::kShowedDisabledPluginPlaceholderForEmbeddedPdf); 886 PDFLoadStatus::kShowedDisabledPluginPlaceholderForEmbeddedPdf);
887
888 if (base::FeatureList::IsEnabled(
889 features::kClickToOpenPDFPlaceholder)) {
890 return PDFPluginPlaceholder::CreatePDFPlaceholder(render_frame,
891 params)
892 ->plugin();
893 }
886 } 894 }
887 895
888 placeholder = create_blocked_plugin( 896 placeholder = create_blocked_plugin(
889 IDR_DISABLED_PLUGIN_HTML, 897 IDR_DISABLED_PLUGIN_HTML,
890 l10n_util::GetStringFUTF16(IDS_PLUGIN_DISABLED, group_name)); 898 l10n_util::GetStringFUTF16(IDS_PLUGIN_DISABLED, group_name));
891 break; 899 break;
892 } 900 }
893 case ChromeViewHostMsg_GetPluginInfo_Status::kFlashHiddenPreferHtml: { 901 case ChromeViewHostMsg_GetPluginInfo_Status::kFlashHiddenPreferHtml: {
894 placeholder = create_blocked_plugin( 902 placeholder = create_blocked_plugin(
895 IDR_PREFER_HTML_PLUGIN_HTML, 903 IDR_PREFER_HTML_PLUGIN_HTML,
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after
1609 if (safe_browsing_) 1617 if (safe_browsing_)
1610 return true; 1618 return true;
1611 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( 1619 if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
1612 switches::kEnableNetworkService)) { 1620 switches::kEnableNetworkService)) {
1613 return false; 1621 return false;
1614 } 1622 }
1615 RenderThread::Get()->GetConnector()->BindInterface( 1623 RenderThread::Get()->GetConnector()->BindInterface(
1616 content::mojom::kBrowserServiceName, &safe_browsing_); 1624 content::mojom::kBrowserServiceName, &safe_browsing_);
1617 return true; 1625 return true;
1618 } 1626 }
OLDNEW
« no previous file with comments | « chrome/renderer/BUILD.gn ('k') | chrome/renderer/plugins/pdf_plugin_placeholder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698