Implement chromium.self in content scripts, fix bugs

chrome/common/extensions/user_script.h

 // Copyright 2009 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 CHROME_COMMON_EXTENSIONS_USER_SCRIPT_H_
 #define CHROME_COMMON_EXTENSIONS_USER_SCRIPT_H_
 
 #include <vector>
 #include <string>
 
@@ skipping 93 matching lines @@
   void clear_url_patterns() { url_patterns_.clear(); }
 
   // List of js scripts for this user script
   FileList& js_scripts() { return js_scripts_; }
   const FileList& js_scripts() const { return js_scripts_; }
 
   // List of css scripts for this user script
   FileList& css_scripts() { return css_scripts_; }
   const FileList& css_scripts() const { return css_scripts_; }
 
+  const std::string& extension_id() const { return extension_id_; }
+  void set_extension_id(const std::string& id) { extension_id_ = id; }
+
+  bool is_standalone() { return extension_id_.empty(); }
+
   // Returns true if the script should be applied to the specified URL, false
   // otherwise.
   bool MatchesUrl(const GURL& url);
 
   // Serialize the UserScript into a pickle. The content of the scripts and
   // paths to UserScript::Files will not be serialized!
   void Pickle(::Pickle* pickle) const;
 
   // Deserialize the script from a pickle. Note that this always succeeds
   // because presumably we were the one that pickled it, and we did it
@@ skipping 10 matching lines @@
 
   // URLPatterns that determine pages to inject the script into. These are
   // only used with scripts that are part of extensions.
   std::vector<URLPattern> url_patterns_;
 
   // List of js scripts defined in content_scripts
   FileList js_scripts_;
 
   // List of css scripts defined in content_scripts
   FileList css_scripts_;
+
+  // The ID of the extension this script is a part of, if any. Can be empty if
+  // the script is a "standlone" user script.
+  std::string extension_id_;
 };
 
 typedef std::vector<UserScript> UserScriptList;
 
 #endif  // CHROME_COMMON_EXTENSIONS_USER_SCRIPT_H_