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

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

Issue 2549503003: [HBD] Fix the misleading no-fallback placeholder message in BLOCK mode. (Closed)
Patch Set: Created 4 years 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/common/render_messages.h ('k') | no next file » | 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/command_line.h" 10 #include "base/command_line.h"
(...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after
849 case ChromeViewHostMsg_GetPluginInfo_Status::kBlockedByPolicy: { 849 case ChromeViewHostMsg_GetPluginInfo_Status::kBlockedByPolicy: {
850 placeholder = create_blocked_plugin( 850 placeholder = create_blocked_plugin(
851 IDR_BLOCKED_PLUGIN_HTML, 851 IDR_BLOCKED_PLUGIN_HTML,
852 l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_BY_POLICY, 852 l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_BY_POLICY,
853 group_name)); 853 group_name));
854 RenderThread::Get()->RecordAction( 854 RenderThread::Get()->RecordAction(
855 UserMetricsAction("Plugin_BlockedByPolicy")); 855 UserMetricsAction("Plugin_BlockedByPolicy"));
856 observer->DidBlockContentType(content_type, group_name); 856 observer->DidBlockContentType(content_type, group_name);
857 break; 857 break;
858 } 858 }
859 case ChromeViewHostMsg_GetPluginInfo_Status::kBlockedNoLoading: {
860 placeholder = create_blocked_plugin(
861 IDR_BLOCKED_PLUGIN_HTML,
862 l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
863 group_name));
864 observer->DidBlockContentType(content_type, group_name);
865 break;
866 }
859 case ChromeViewHostMsg_GetPluginInfo_Status::kComponentUpdateRequired: { 867 case ChromeViewHostMsg_GetPluginInfo_Status::kComponentUpdateRequired: {
860 placeholder = create_blocked_plugin( 868 placeholder = create_blocked_plugin(
861 IDR_BLOCKED_PLUGIN_HTML, 869 IDR_BLOCKED_PLUGIN_HTML,
862 l10n_util::GetStringFUTF16(IDS_PLUGIN_OUTDATED, group_name)); 870 l10n_util::GetStringFUTF16(IDS_PLUGIN_OUTDATED, group_name));
863 placeholder->AllowLoading(); 871 placeholder->AllowLoading();
864 render_frame->Send(new ChromeViewHostMsg_BlockedComponentUpdatedPlugin( 872 render_frame->Send(new ChromeViewHostMsg_BlockedComponentUpdatedPlugin(
865 render_frame->GetRoutingID(), placeholder->CreateRoutingId(), 873 render_frame->GetRoutingID(), placeholder->CreateRoutingId(),
866 identifier)); 874 identifier));
867 break; 875 break;
868 } 876 }
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
1470 1478
1471 url::Replacements<char> r; 1479 url::Replacements<char> r;
1472 r.SetPath(path.c_str(), url::Component(0, path.length())); 1480 r.SetPath(path.c_str(), url::Component(0, path.length()));
1473 1481
1474 if (result == internal::NUM_PLUGIN_ERROR) 1482 if (result == internal::NUM_PLUGIN_ERROR)
1475 result = invalid_url ? internal::SUCCESS_PARAMS_REWRITE : internal::SUCCESS; 1483 result = invalid_url ? internal::SUCCESS_PARAMS_REWRITE : internal::SUCCESS;
1476 1484
1477 RecordYouTubeRewriteUMA(result); 1485 RecordYouTubeRewriteUMA(result);
1478 return corrected_url.ReplaceComponents(r); 1486 return corrected_url.ReplaceComponents(r);
1479 } 1487 }
OLDNEW
« no previous file with comments | « chrome/common/render_messages.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698