Renderer changes for wiring up shared memory with declarative injection

extensions/renderer/user_script_injector.h

 // 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.
 
 #ifndef EXTENSIONS_RENDERER_USER_SCRIPT_INJECTOR_H_
 #define EXTENSIONS_RENDERER_USER_SCRIPT_INJECTOR_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/scoped_observer.h"
 #include "extensions/common/user_script.h"
 #include "extensions/renderer/script_injection.h"
 #include "extensions/renderer/user_script_set.h"
 
 namespace blink {
 class WebFrame;
 }
 
 namespace extensions {
 class Extension;
 
 // A ScriptInjector for UserScripts.
 class UserScriptInjector : public ScriptInjector,
                            public UserScriptSet::Observer {
  public:
   UserScriptInjector(const UserScript* user_script,
-                     UserScriptSet* user_script_set);
+                     UserScriptSet* user_script_set,
+                     bool is_declarative);
   virtual ~UserScriptInjector();
 
+  // ScriptInjector implementation.
+  virtual bool is_declarative() const OVERRIDE;

[Devlin, 2014/08/21 17:06:17]

why?

[Mark Dittmer, 2014/08/23 12:21:39]

ditto (comment in programmatic_script_injector.h)

+
  private:
   // UserScriptSet::Observer implementation.
   virtual void OnUserScriptsUpdated(
       const std::set<std::string>& changed_extensions,
       const std::vector<UserScript*>& scripts) OVERRIDE;
 
   // ScriptInjector implementation.
   virtual UserScript::InjectionType script_type() const OVERRIDE;
   virtual bool ShouldExecuteInChildFrames() const OVERRIDE;
   virtual bool ShouldExecuteInMainWorld() const OVERRIDE;
@@ skipping 23 matching lines @@
   const UserScript* script_;
 
   // The id of the associated user script. We cache this because when we update
   // the |script_| associated with this injection, the old referance may be
   // deleted.
   int64 script_id_;
 
   // The associated extension id, preserved for the same reason as |script_id|.
   std::string extension_id_;
 
+  // Indicates whether or not this script is declarative. This influences which
+  // script permissions are checked before injection.
+  bool is_declarative_;
+
   ScopedObserver<UserScriptSet, UserScriptSet::Observer>
       user_script_set_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(UserScriptInjector);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_RENDERER_USER_SCRIPT_INJECTOR_H_