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

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

Issue 61643022: Proxy private UMA pepper interface for out-of-process and NaCl plugins. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressing feedback Created 7 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
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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/debug/crash_logging.h" 8 #include "base/debug/crash_logging.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 1274 matching lines...) Expand 10 before | Expand all | Expand 10 after
1285 } 1285 }
1286 1286
1287 bool ChromeContentRendererClient::IsExternalPepperPlugin( 1287 bool ChromeContentRendererClient::IsExternalPepperPlugin(
1288 const std::string& module_name) { 1288 const std::string& module_name) {
1289 // TODO(bbudge) remove this when the trusted NaCl plugin has been removed. 1289 // TODO(bbudge) remove this when the trusted NaCl plugin has been removed.
1290 // We must defer certain plugin events for NaCl instances since we switch 1290 // We must defer certain plugin events for NaCl instances since we switch
1291 // from the in-process to the out-of-process proxy after instantiating them. 1291 // from the in-process to the out-of-process proxy after instantiating them.
1292 return module_name == "Native Client"; 1292 return module_name == "Native Client";
1293 } 1293 }
1294 1294
1295 bool ChromeContentRendererClient::IsExtensionOrSharedModuleWhitelisted(
1296 const GURL& url, const std::set<std::string>& whitelist) {
1297 const ExtensionSet* extension_set =
1298 g_current_client->extension_dispatcher_->extensions();
1299 return chrome::IsExtensionOrSharedModuleWhitelisted(url, extension_set,
1300 whitelist);
1301 }
1302
1295 blink::WebSpeechSynthesizer* 1303 blink::WebSpeechSynthesizer*
1296 ChromeContentRendererClient::OverrideSpeechSynthesizer( 1304 ChromeContentRendererClient::OverrideSpeechSynthesizer(
1297 blink::WebSpeechSynthesizerClient* client) { 1305 blink::WebSpeechSynthesizerClient* client) {
1298 return new TtsDispatcher(client); 1306 return new TtsDispatcher(client);
1299 } 1307 }
1300 1308
1301 bool ChromeContentRendererClient::AllowBrowserPlugin( 1309 bool ChromeContentRendererClient::AllowBrowserPlugin(
1302 blink::WebPluginContainer* container) { 1310 blink::WebPluginContainer* container) {
1303 if (CommandLine::ForCurrentProcess()->HasSwitch( 1311 if (CommandLine::ForCurrentProcess()->HasSwitch(
1304 switches::kEnableBrowserPluginForAllViewTypes)) 1312 switches::kEnableBrowserPluginForAllViewTypes))
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
1364 CommandLine* command_line = CommandLine::ForCurrentProcess(); 1372 CommandLine* command_line = CommandLine::ForCurrentProcess();
1365 return !command_line->HasSwitch(switches::kExtensionProcess); 1373 return !command_line->HasSwitch(switches::kExtensionProcess);
1366 } 1374 }
1367 1375
1368 blink::WebWorkerPermissionClientProxy* 1376 blink::WebWorkerPermissionClientProxy*
1369 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( 1377 ChromeContentRendererClient::CreateWorkerPermissionClientProxy(
1370 content::RenderView* render_view, 1378 content::RenderView* render_view,
1371 blink::WebFrame* frame) { 1379 blink::WebFrame* frame) {
1372 return new WorkerPermissionClientProxy(render_view, frame); 1380 return new WorkerPermissionClientProxy(render_view, frame);
1373 } 1381 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698