| OLD | NEW |
| 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 <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 602 top_url.host() == "plus.sandbox.google.com") && | 602 top_url.host() == "plus.sandbox.google.com") && |
| 603 top_url.path().find("/games") == 0); | 603 top_url.path().find("/games") == 0); |
| 604 | 604 |
| 605 // Allow Chrome Web Store extensions, built-in extensions, extensions | 605 // Allow Chrome Web Store extensions, built-in extensions, extensions |
| 606 // under development, invocations from whitelisted URLs, and all invocations | 606 // under development, invocations from whitelisted URLs, and all invocations |
| 607 // if --enable-nacl is set. | 607 // if --enable-nacl is set. |
| 608 bool is_nacl_allowed = | 608 bool is_nacl_allowed = |
| 609 #if !defined(__arm__) | 609 #if !defined(__arm__) |
| 610 // The ARM ABI is not quite stable, so only allow NaCl for | 610 // The ARM ABI is not quite stable, so only allow NaCl for |
| 611 // unrestricted extensions (i.e. built-in and under development). | 611 // unrestricted extensions (i.e. built-in and under development). |
| 612 // See http://crbug.com/145694 |
| 612 // TODO(dschuff): remove this when the ABI is stable | 613 // TODO(dschuff): remove this when the ABI is stable |
| 613 is_extension_from_webstore || | 614 is_extension_from_webstore || |
| 614 is_whitelisted_url || | 615 is_whitelisted_url || |
| 615 #endif | 616 #endif |
| 616 is_extension_unrestricted || | 617 is_extension_unrestricted || |
| 617 is_nacl_unrestricted; | 618 is_nacl_unrestricted; |
| 618 if (is_nacl_allowed) { | 619 if (is_nacl_allowed) { |
| 619 bool app_can_use_dev_interfaces = | 620 bool app_can_use_dev_interfaces = |
| 620 // NaCl PDF viewer extension | 621 // NaCl PDF viewer extension |
| 621 (is_extension_from_webstore && | 622 (is_extension_from_webstore && |
| (...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 957 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() { | 958 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() { |
| 958 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled(); | 959 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled(); |
| 959 } | 960 } |
| 960 | 961 |
| 961 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( | 962 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( |
| 962 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { | 963 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { |
| 963 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); | 964 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); |
| 964 } | 965 } |
| 965 | 966 |
| 966 } // namespace chrome | 967 } // namespace chrome |
| OLD | NEW |