Implement chromium.self in content scripts, fix bugs

chrome/browser/extensions/extension.h

 // Copyright (c) 2006-2008 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_BROWSER_EXTENSIONS_EXTENSION_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_H_
 
 #include <string>
 #include <vector>
 #include <map>
@@ skipping 82 matching lines @@
   // The |relative_path| can be untrusted user input. The returned path will
   // either be empty or a child of extension_path.
   // NOTE: Static so that it can be used from multiple threads.
   static FilePath GetResourcePath(const FilePath& extension_path,
                                   const std::string& relative_path);
   FilePath GetResourcePath(const std::string& relative_path) {
     return GetResourcePath(path(), relative_path);
   }
 
   // Initialize the extension from a parsed manifest.
-  bool InitFromValue(const DictionaryValue& value, std::string* error);
+  // If |require_id| is true, will return an error if the "id" key is missing
+  // from the value.
+  bool InitFromValue(const DictionaryValue& value, bool require_id,
+                     std::string* error);
 
   // Returns an absolute path to a resource inside of an extension if the
   // extension has a theme defined with the given |resource_id|.  Otherwise
   // the path will be empty.  Note that this method is not static as it is
   // only intended to be called on an extension which has registered itself
   // as providing a theme.
   FilePath GetThemeResourcePath(const int resource_id);
 
   const FilePath& path() const { return path_; }
-  const GURL& url();
+  const GURL& url() const { return extension_url_; }
   const std::string& id() const { return id_; }
-  void set_id(const std::string& id);
   const Version* version() const { return version_.get(); }
   // String representation of the version number.
   const std::string VersionString() const;
   const std::string& name() const { return name_; }
   const std::string& description() const { return description_; }
   const UserScriptList& content_scripts() const { return content_scripts_; }
   const FilePath& plugins_dir() const { return plugins_dir_; }
   const std::vector<std::string>& toolstrips() const { return toolstrips_; }
   const std::vector<URLPattern>& permissions() const {
       return permissions_; }
@@ skipping 46 matching lines @@
   // A map of resource id's to relative file paths.
   std::map<const std::wstring, std::string> theme_paths_;
 
   std::vector<URLPattern> permissions_;
 
   // We implement copy, but not assign.
   void operator=(const Extension&);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_H_