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

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

Issue 10910004: Disable ChromeContentRendererClientTest.NaClRestriction on ARM. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Added bug ID to TODOs Created 8 years, 3 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
« no previous file with comments | « no previous file | chrome/renderer/chrome_content_renderer_client_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <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
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 // https://code.google.com/p/chromium/issues/detail?id=145694
Nico 2012/08/30 16:14:58 nit: http://crbug.com/145694 is a bit shorter
Iain Merrick 2012/08/30 16:53:39 Done.
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
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
OLDNEW
« no previous file with comments | « no previous file | chrome/renderer/chrome_content_renderer_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698