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/common/plugin_utils.cc

Issue 2356053002: [HBD] Only use Plugin Content Settings for Flash. (Closed)
Patch Set: fix Created 4 years, 2 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/common/plugin_utils.h" 5 #include "chrome/common/plugin_utils.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "content/public/common/content_constants.h"
8 #include "content/public/common/webplugininfo.h" 9 #include "content/public/common/webplugininfo.h"
9 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. 10 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
10 11
11 #if !defined(DISABLE_NACL) 12 #if !defined(DISABLE_NACL)
12 #include "components/nacl/common/nacl_constants.h" 13 #include "components/nacl/common/nacl_constants.h"
13 #endif 14 #endif
14 15
15 bool ShouldUseJavaScriptSettingForPlugin(const content::WebPluginInfo& plugin) { 16 bool ShouldUseJavaScriptSettingForPlugin(const content::WebPluginInfo& plugin) {
16 if (plugin.type != content::WebPluginInfo::PLUGIN_TYPE_PEPPER_IN_PROCESS && 17 if (plugin.name == base::ASCIIToUTF16(content::kFlashPluginName))
raymes 2016/09/26 08:18:29 I think we should check that it's an out of proces
tommycli 2016/09/27 18:51:06 Done. Thanks for the suggestion.
17 plugin.type !=
18 content::WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS) {
19 return false; 18 return false;
20 }
21 19
22 #if !defined(DISABLE_NACL) 20 #if !defined(DISABLE_NACL)
23 // Treat Native Client invocations like JavaScript. 21 // Treat Native Client invocations like JavaScript.
24 if (plugin.name == base::ASCIIToUTF16(nacl::kNaClPluginName)) 22 if (plugin.name == base::ASCIIToUTF16(nacl::kNaClPluginName))
25 return true; 23 return true;
26 #endif 24 #endif
27 25
28 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) 26 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
29 // Treat CDM invocations like JavaScript. 27 // Treat CDM invocations like JavaScript.
30 if (plugin.name == base::ASCIIToUTF16(kWidevineCdmDisplayName)) { 28 if (plugin.name == base::ASCIIToUTF16(kWidevineCdmDisplayName)) {
31 DCHECK_EQ(content::WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS, 29 DCHECK_EQ(content::WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS,
32 plugin.type); 30 plugin.type);
33 return true; 31 return true;
34 } 32 }
35 #endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) 33 #endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
36 34
37 return false; 35 return false;
38 } 36 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698