chrome/browser/content_settings/content_settings_internal_extension_provider.cc - Issue 348433003: Add hashes to whitelist for Chromoting plugin.

Side by Side Diff: chrome/browser/content_settings/content_settings_internal_extension_provider.cc

Issue 348433003: Add hashes to whitelist for Chromoting plugin. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 6 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 | Annotate | Revision Log

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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/browser/content_settings/content_settings_internal_extension_pr ovider.h"	5 #include "chrome/browser/content_settings/content_settings_internal_extension_pr ovider.h"

6	6

7 #include "chrome/browser/chrome_notification_types.h"	7 #include "chrome/browser/chrome_notification_types.h"

8 #include "chrome/browser/content_settings/content_settings_rule.h"	8 #include "chrome/browser/content_settings/content_settings_rule.h"

9 #include "chrome/browser/extensions/extension_service.h"	9 #include "chrome/browser/extensions/extension_service.h"

10 #include "chrome/common/chrome_content_client.h"	10 #include "chrome/common/chrome_content_client.h"

(...skipping 88 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
99 "C32D6D93E12F5401DAA3A723E0C3CC5F25429BA4",	99 "C32D6D93E12F5401DAA3A723E0C3CC5F25429BA4",

100 "9099782647D39C778E15C8C6E0D23C88F5CDE170",	100 "9099782647D39C778E15C8C6E0D23C88F5CDE170",

101 "B7D5B52D1E5B106288BD7F278CAFA5E8D76108B0",	101 "B7D5B52D1E5B106288BD7F278CAFA5E8D76108B0",

102 "89349DBAA2C4022FB244AA50182AB60934EB41EE",	102 "89349DBAA2C4022FB244AA50182AB60934EB41EE",

103 "CB593E510640572A995CB1B6D41BD85ED51E63F8",	103 "CB593E510640572A995CB1B6D41BD85ED51E63F8",

104 "1AD1AC86C87969CD3434FA08D99DBA6840AEA612",	104 "1AD1AC86C87969CD3434FA08D99DBA6840AEA612",

105 "9C2EA21D7975BDF2B3C01C3A454EE44854067A6D",	105 "9C2EA21D7975BDF2B3C01C3A454EE44854067A6D",

106 "D2C488C80C3C90C3E01A991112A05E37831E17D0",	106 "D2C488C80C3C90C3E01A991112A05E37831E17D0",

107 "6EEC061C0E74B46C7B5BE2EEFA49436368F4988F",	107 "6EEC061C0E74B46C7B5BE2EEFA49436368F4988F",

108 "8B344D9E8A4C505EF82A0DBBC25B8BD1F984E777",	108 "8B344D9E8A4C505EF82A0DBBC25B8BD1F984E777",

109 "E06AFCB1EB0EFD237824CC4AC8FDD3D43E8BC868"	109 "E06AFCB1EB0EFD237824CC4AC8FDD3D43E8BC868",

	110

	111 // http://crbug.com/386324

	112 "F76F43EFFF56BF17A9868A5243F339BA28746632",

	113 "C6EA52B92F80878515F94137020F01519357E5B5",

	114 "E466389F058ABD73FF6FDD06F768A351FCBF8532",

	115 "40063F1CF7B68BA847A26FA6620DDF156171D23C",

	116 "A6FD8E15353CF1F5C3D0A7B20E1D10AEA4DD3E6A",

	117 "57AC4D9E6BD8A2D0A70056B5FAC2378CAA588912",

	118 "02037314DA4D913640DCF0E296A7D01F4FD793EC",

	119 "B6EC0809BC63E10B431C5E4AA3645232CA86B2A5",

	120 "48CA541313139786F056DBCB504A1025CFF5D2E3",

	121 "05106136AE7F08A3C181D4648E5438350B1D2B4F"

110 };	122 };

111 if (extensions::SimpleFeature::IsIdInList(	123 if (extensions::SimpleFeature::IsIdInList(

112 host->extension()->id(),	124 host->extension()->id(),

113 std::set<std::string>(	125 std::set<std::string>(

114 kAppWhitelist, kAppWhitelist + arraysize(kAppWhitelist)))) {	126 kAppWhitelist, kAppWhitelist + arraysize(kAppWhitelist)))) {

115 SetContentSettingForExtensionAndResource(	127 SetContentSettingForExtensionAndResource(

116 host->extension(),	128 host->extension(),

117 ChromeContentClient::kRemotingViewerPluginPath,	129 ChromeContentClient::kRemotingViewerPluginPath,

118 CONTENT_SETTING_ALLOW);	130 CONTENT_SETTING_ALLOW);

119 }	131 }

(...skipping 60 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
180 base::Value::CreateIntegerValue(setting));	192 base::Value::CreateIntegerValue(setting));

181 }	193 }

182 }	194 }

183 NotifyObservers(primary_pattern,	195 NotifyObservers(primary_pattern,

184 secondary_pattern,	196 secondary_pattern,

185 CONTENT_SETTINGS_TYPE_PLUGINS,	197 CONTENT_SETTINGS_TYPE_PLUGINS,

186 resource);	198 resource);

187 }	199 }

188	200

189 } // namespace content_settings	201 } // namespace content_settings

OLD	NEW

« no previous file with comments | « no previous file | no next file » | no next file with comments »