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

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

Issue 2154773002: Implement Just-In-Time Flash updates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: git pull && gclient sync Created 4 years, 4 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/common/render_messages.h ('k') | chrome/renderer/plugins/chrome_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/command_line.h" 10 #include "base/command_line.h"
(...skipping 843 matching lines...) Expand 10 before | Expand all | Expand 10 after
854 case ChromeViewHostMsg_GetPluginInfo_Status::kBlockedByPolicy: { 854 case ChromeViewHostMsg_GetPluginInfo_Status::kBlockedByPolicy: {
855 placeholder = create_blocked_plugin( 855 placeholder = create_blocked_plugin(
856 IDR_BLOCKED_PLUGIN_HTML, 856 IDR_BLOCKED_PLUGIN_HTML,
857 l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_BY_POLICY, 857 l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_BY_POLICY,
858 group_name)); 858 group_name));
859 RenderThread::Get()->RecordAction( 859 RenderThread::Get()->RecordAction(
860 UserMetricsAction("Plugin_BlockedByPolicy")); 860 UserMetricsAction("Plugin_BlockedByPolicy"));
861 observer->DidBlockContentType(content_type, group_name); 861 observer->DidBlockContentType(content_type, group_name);
862 break; 862 break;
863 } 863 }
864 case ChromeViewHostMsg_GetPluginInfo_Status::kComponentUpdateRequired: {
865 placeholder = create_blocked_plugin(
866 IDR_BLOCKED_PLUGIN_HTML,
867 l10n_util::GetStringFUTF16(IDS_PLUGIN_OUTDATED, group_name));
868 placeholder->AllowLoading();
869 render_frame->Send(new ChromeViewHostMsg_BlockedComponentUpdatedPlugin(
870 render_frame->GetRoutingID(), placeholder->CreateRoutingId(),
871 identifier));
872 break;
873 }
864 } 874 }
865 } 875 }
866 placeholder->SetStatus(status); 876 placeholder->SetStatus(status);
867 return placeholder->plugin(); 877 return placeholder->plugin();
868 } 878 }
869 #endif // defined(ENABLE_PLUGINS) 879 #endif // defined(ENABLE_PLUGINS)
870 880
871 // For NaCl content handling plugins, the NaCl manifest is stored in an 881 // For NaCl content handling plugins, the NaCl manifest is stored in an
872 // additonal 'nacl' param associated with the MIME type. 882 // additonal 'nacl' param associated with the MIME type.
873 // static 883 // static
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
1372 // chrome.system.network.getNetworkInterfaces provides the same 1382 // chrome.system.network.getNetworkInterfaces provides the same
1373 // information. Also, the enforcement of sending and binding UDP is already done 1383 // information. Also, the enforcement of sending and binding UDP is already done
1374 // by chrome extension permission model. 1384 // by chrome extension permission model.
1375 bool ChromeContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() { 1385 bool ChromeContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() {
1376 #if defined(ENABLE_EXTENSIONS) 1386 #if defined(ENABLE_EXTENSIONS)
1377 return !IsStandaloneExtensionProcess(); 1387 return !IsStandaloneExtensionProcess();
1378 #else 1388 #else
1379 return true; 1389 return true;
1380 #endif 1390 #endif
1381 } 1391 }
OLDNEW
« no previous file with comments | « chrome/common/render_messages.h ('k') | chrome/renderer/plugins/chrome_plugin_placeholder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698