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

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

Issue 22407017: Remove whitelist restriction for Shared Modules on dev channel. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix unit test + rebase Created 7 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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 return true; 201 return true;
202 } 202 }
203 #endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) 203 #endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
204 204
205 return false; 205 return false;
206 } 206 }
207 207
208 #if defined(ENABLE_PLUGINS) 208 #if defined(ENABLE_PLUGINS)
209 const char* kPredefinedAllowedFileHandleOrigins[] = { 209 const char* kPredefinedAllowedFileHandleOrigins[] = {
210 "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F", // see crbug.com/234789 210 "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F", // see crbug.com/234789
211 "4EB74897CB187C7633357C2FE832E0AD6A44883A" // see crbug.com/234789
211 }; 212 };
212 #endif 213 #endif
213 214
214 } // namespace 215 } // namespace
215 216
216 namespace chrome { 217 namespace chrome {
217 218
218 ChromeContentRendererClient::ChromeContentRendererClient() { 219 ChromeContentRendererClient::ChromeContentRendererClient() {
219 g_current_client = this; 220 g_current_client = this;
220 221
(...skipping 1077 matching lines...) Expand 10 before | Expand all | Expand 10 after
1298 if (CommandLine::ForCurrentProcess()->HasSwitch( 1299 if (CommandLine::ForCurrentProcess()->HasSwitch(
1299 switches::kEnablePepperTesting)) { 1300 switches::kEnablePepperTesting)) {
1300 return true; 1301 return true;
1301 } 1302 }
1302 #endif // !defined(OS_ANDROID) 1303 #endif // !defined(OS_ANDROID)
1303 return false; 1304 return false;
1304 } 1305 }
1305 1306
1306 1307
1307 } // namespace chrome 1308 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698