X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Frenderer%2Fextensions%2Frenderer_permissions_policy_delegate.cc;h=73a1c730d04c17b889c2ae5fa4ef94c7b770f820;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=0f751b2919e5e37a0f3720d8b08f59fa7f146aa6;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/chrome/renderer/extensions/renderer_permissions_policy_delegate.cc b/src/chrome/renderer/extensions/renderer_permissions_policy_delegate.cc
index 0f751b2..73a1c73 100644
--- a/src/chrome/renderer/extensions/renderer_permissions_policy_delegate.cc
+++ b/src/chrome/renderer/extensions/renderer_permissions_policy_delegate.cc
@@ -10,6 +10,7 @@
 #include "chrome/renderer/extensions/dispatcher.h"
 #include "extensions/common/extensions_client.h"
 #include "extensions/common/manifest_constants.h"
+#include "extensions/common/switches.h"
 
 namespace extensions {
 
@@ -38,13 +39,15 @@ bool RendererPermissionsPolicyDelegate::CanExecuteScriptOnPage(
     return true;
   }
 
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSigninProcess)) {
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(::switches::kSigninProcess)) {
     if (error)
       *error = errors::kCannotScriptSigninPage;
     return false;
   }
 
-  if (dispatcher_->IsExtensionActive(extension_misc::kWebStoreAppId)) {
+  if (dispatcher_->IsExtensionActive(extension_misc::kWebStoreAppId) &&
+      !command_line->HasSwitch(switches::kAllowScriptingGallery)) {
     if (error)
       *error = errors::kCannotScriptGallery;
     return false;