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

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: Through #39 + pepper_flash_component_installer compile fix 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
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 845 matching lines...) Expand 10 before | Expand all | Expand 10 after
856 case ChromeViewHostMsg_GetPluginInfo_Status::kBlockedByPolicy: { 856 case ChromeViewHostMsg_GetPluginInfo_Status::kBlockedByPolicy: {
857 placeholder = create_blocked_plugin( 857 placeholder = create_blocked_plugin(
858 IDR_BLOCKED_PLUGIN_HTML, 858 IDR_BLOCKED_PLUGIN_HTML,
859 l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_BY_POLICY, 859 l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_BY_POLICY,
860 group_name)); 860 group_name));
861 RenderThread::Get()->RecordAction( 861 RenderThread::Get()->RecordAction(
862 UserMetricsAction("Plugin_BlockedByPolicy")); 862 UserMetricsAction("Plugin_BlockedByPolicy"));
863 observer->DidBlockContentType(content_type, group_name); 863 observer->DidBlockContentType(content_type, group_name);
864 break; 864 break;
865 } 865 }
866 case ChromeViewHostMsg_GetPluginInfo_Status::kComponentUpdateRequired: {
867 placeholder = create_blocked_plugin(
868 IDR_BLOCKED_PLUGIN_HTML,
869 l10n_util::GetStringFUTF16(IDS_PLUGIN_OUTDATED, group_name));
870 placeholder->AllowLoading();
871 render_frame->Send(new ChromeViewHostMsg_BlockedComponentUpdatedPlugin(
872 render_frame->GetRoutingID(), placeholder->CreateRoutingId(),
873 identifier));
874 break;
875 }
866 } 876 }
867 } 877 }
868 placeholder->SetStatus(status); 878 placeholder->SetStatus(status);
869 return placeholder->plugin(); 879 return placeholder->plugin();
870 } 880 }
871 #endif // defined(ENABLE_PLUGINS) 881 #endif // defined(ENABLE_PLUGINS)
872 882
873 // For NaCl content handling plugins, the NaCl manifest is stored in an 883 // For NaCl content handling plugins, the NaCl manifest is stored in an
874 // additonal 'nacl' param associated with the MIME type. 884 // additonal 'nacl' param associated with the MIME type.
875 // static 885 // static
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
1374 // chrome.system.network.getNetworkInterfaces provides the same 1384 // chrome.system.network.getNetworkInterfaces provides the same
1375 // information. Also, the enforcement of sending and binding UDP is already done 1385 // information. Also, the enforcement of sending and binding UDP is already done
1376 // by chrome extension permission model. 1386 // by chrome extension permission model.
1377 bool ChromeContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() { 1387 bool ChromeContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() {
1378 #if defined(ENABLE_EXTENSIONS) 1388 #if defined(ENABLE_EXTENSIONS)
1379 return !IsStandaloneExtensionProcess(); 1389 return !IsStandaloneExtensionProcess();
1380 #else 1390 #else
1381 return true; 1391 return true;
1382 #endif 1392 #endif
1383 } 1393 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698