Create withheld permissions

extensions/renderer/programmatic_script_injector.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/renderer/programmatic_script_injector.h"
 
 #include <vector>
 
 #include "base/values.h"
 #include "content/public/renderer/render_view.h"
@@ skipping 16 matching lines @@
     blink::WebFrame* web_frame)
     : params_(new ExtensionMsg_ExecuteCode_Params(params)),
       web_frame_(web_frame),
       results_(new base::ListValue()),
       finished_(false) {
 }
 
 ProgrammaticScriptInjector::~ProgrammaticScriptInjector() {
 }
 
+extension_misc::InjectedScriptType
+ProgrammaticScriptInjector::script_type() const {
+  return extension_misc::PROGRAMMATIC_SCRIPT;
+}
+
 bool ProgrammaticScriptInjector::ShouldExecuteInChildFrames() const {
   return params_->all_frames;
 }
 
 bool ProgrammaticScriptInjector::ShouldExecuteInMainWorld() const {
   return params_->in_main_world;
 }
 
 bool ProgrammaticScriptInjector::IsUserGesture() const {
   return params_->user_gesture;
 }
 
 bool ProgrammaticScriptInjector::ExpectsResults() const {
   return params_->wants_result;
 }
 
 bool ProgrammaticScriptInjector::ShouldInjectJs(
     UserScript::RunLocation run_location) const {
   return GetRunLocation() == run_location && params_->is_javascript;
 }
 
 bool ProgrammaticScriptInjector::ShouldInjectCss(
     UserScript::RunLocation run_location) const {
   return GetRunLocation() == run_location && !params_->is_javascript;
 }
 
-ScriptInjector::AccessType ProgrammaticScriptInjector::CanExecuteOnFrame(
+PermissionsData::AccessType ProgrammaticScriptInjector::CanExecuteOnFrame(
     const Extension* extension,
     blink::WebFrame* frame,
     int tab_id,
     const GURL& top_url) const {
   GURL effective_document_url = ScriptContext::GetEffectiveDocumentURL(
       frame, frame->document().url(), params_->match_about_blank);
   if (params_->is_web_view) {
-    return effective_document_url == params_->webview_src ? ALLOW_ACCESS
-                                                          : DENY_ACCESS;
+    return effective_document_url == params_->webview_src ?
+        PermissionsData::ALLOW_ACCESS : PermissionsData::DENY_ACCESS;
   }
 
-  if (!extension->permissions_data()->CanAccessPage(extension,
-                                                    effective_document_url,
-                                                    top_url,
-                                                    tab_id,
-                                                    -1,  // no process ID.
-                                                    NULL /* ignore error */)) {
-    return DENY_ACCESS;
-  }
-
-  return extension->permissions_data()->RequiresActionForScriptExecution(
-             extension, tab_id, effective_document_url)
-             ? REQUEST_ACCESS
-             : ALLOW_ACCESS;
+  return extension->permissions_data()->CanAccessPageWithUserConsent(
+      extension,
+      effective_document_url,
+      top_url,
+      tab_id,
+      -1,  // no process ID.
+      NULL /* ignore error */);
 }
 
 std::vector<blink::WebScriptSource> ProgrammaticScriptInjector::GetJsSources(
     UserScript::RunLocation run_location) const {
   DCHECK_EQ(GetRunLocation(), run_location);
   DCHECK(params_->is_javascript);
 
   return std::vector<blink::WebScriptSource>(
       1,
       blink::WebScriptSource(
@@ skipping 44 matching lines @@
   render_view->Send(new ExtensionHostMsg_ExecuteCodeFinished(
       render_view->GetRoutingID(),
       params_->request_id,
       error,
       render_view->GetPageId(),
       ScriptContext::GetDataSourceURLForFrame(web_frame_),
       *results_));
 }
 
 }  // namespace extensions