Create withheld permissions

extensions/renderer/user_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/user_script_injector.h"
 
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "content/public/common/url_constants.h"
+#include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/renderer/script_context.h"
 #include "extensions/renderer/scripts_run_info.h"
 #include "grit/extensions_renderer_resources.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebScriptSource.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "url/gurl.h"
@@ skipping 59 matching lines @@
        ++iter) {
     // We need to compare to |script_id_| (and not to script_->id()) because the
     // old |script_| may be deleted by now.
     if ((*iter)->id() == script_id_) {
       script_ = *iter;
       break;
     }
   }
 }
 
+extension_misc::InjectedScriptType UserScriptInjector::script_type() const {
+  return extension_misc::CONTENT_SCRIPT;
+}
+
 bool UserScriptInjector::ShouldExecuteInChildFrames() const {
   return false;
 }
 
 bool UserScriptInjector::ShouldExecuteInMainWorld() const {
   return false;
 }
 
 bool UserScriptInjector::IsUserGesture() const {
   return false;
 }
 
 bool UserScriptInjector::ExpectsResults() const {
   return false;
 }
 
 bool UserScriptInjector::ShouldInjectJs(
     UserScript::RunLocation run_location) const {
   return script_->run_location() == run_location &&
          !script_->js_scripts().empty();
 }
 
 bool UserScriptInjector::ShouldInjectCss(
     UserScript::RunLocation run_location) const {
   return run_location == UserScript::DOCUMENT_START &&
          !script_->css_scripts().empty();
 }
 
-ScriptInjector::AccessType UserScriptInjector::CanExecuteOnFrame(
+PermissionsData::AccessType UserScriptInjector::CanExecuteOnFrame(
     const Extension* extension,
     blink::WebFrame* web_frame,
     int tab_id,
     const GURL& top_url) const {
   // If we don't have a tab id, we have no UI surface to ask for user consent.
   // For now, we treat this as an automatic allow.
   if (tab_id == -1)
-    return ALLOW_ACCESS;
+    return PermissionsData::ALLOW_ACCESS;
 
   GURL effective_document_url = ScriptContext::GetEffectiveDocumentURL(
       web_frame, web_frame->document().url(), script_->match_about_blank());
 
-  return extension->permissions_data()->RequiresActionForScriptExecution(
-             extension, tab_id, web_frame->top()->document().url())
-             ? REQUEST_ACCESS
-             : ALLOW_ACCESS;
+  return extension->permissions_data()
+      ->CanRunContentScriptOnPageWithUserConsent(
+          extension,
+          effective_document_url,
+          top_url,
+          tab_id,
+          -1,  // no process id
+          NULL /* ignore error */);
 }
 
 std::vector<blink::WebScriptSource> UserScriptInjector::GetJsSources(
     UserScript::RunLocation run_location) const {
   DCHECK_EQ(script_->run_location(), run_location);
 
   std::vector<blink::WebScriptSource> sources;
   const UserScript::FileList& js_scripts = script_->js_scripts();
   bool is_standalone_or_emulate_greasemonkey =
       script_->is_standalone() || script_->emulate_greasemonkey();
@@ skipping 53 matching lines @@
   }
 
   if (ShouldInjectCss(run_location))
     scripts_run_info->num_css += script_->css_scripts().size();
 }
 
 void UserScriptInjector::OnWillNotInject(InjectFailureReason reason) {
 }
 
 }  // namespace extensions