Convert app_bindings.js to the schema_generated_bindings.js infrastructure.

chrome/renderer/extensions/extension_dispatcher.h

 // Copyright (c) 2012 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_RENDERER_EXTENSIONS_EXTENSION_DISPATCHER_H_
 #define CHROME_RENDERER_EXTENSIONS_EXTENSION_DISPATCHER_H_
 #pragma once
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/shared_memory.h"
 #include "base/timer.h"
 #include "content/public/renderer/render_process_observer.h"
 #include "chrome/common/extensions/extension_set.h"
+#include "chrome/common/extensions/feature.h"
+#include "chrome/renderer/extensions/chrome_v8_context.h"
 #include "chrome/renderer/extensions/chrome_v8_context_set.h"
 #include "chrome/renderer/resource_bundle_source_map.h"
 #include "v8/include/v8.h"
 
 class ModuleSystem;
 class GURL;
 class URLPattern;
 class UserScriptSlave;
 struct ExtensionMsg_Loaded_Params;
 
@@ skipping 20 matching lines @@
     return function_names_;
   }
 
   bool is_extension_process() const { return is_extension_process_; }
   const ExtensionSet* extensions() const { return &extensions_; }
   const ChromeV8ContextSet& v8_context_set() const {
     return v8_context_set_;
   }
   UserScriptSlave* user_script_slave() { return user_script_slave_.get(); }
 
-  bool IsApplicationActive(const std::string& extension_id) const;
   bool IsExtensionActive(const std::string& extension_id) const;
 
-  // Whether or not we should set up custom bindings for this api.
-  bool AllowCustomAPI(WebKit::WebFrame* frame,
-                      const std::string& custom_binding_api_name,
-                      int world_id);
+  // Finds the extension ID for the current context. This is determined from

[Aaron Boodman, 2012/03/06 01:17:21]

s/current/specified/

Also, comment should say what, not how:

Finds the extension ID for the JavaScript context associated with the specified
frame and isolated world. If world_id is zero, finds the extension ID associated
with the main world's JavaScript context. If the JavaScript context isn't from
an extension, returns empty string.

[not at google - send to devlin, 2012/03/06 03:53:00]

Done.

+  // |world_id| if it's non-zero, or the URL in |frame| if it is.
+  std::string GetExtensionID(WebKit::WebFrame* frame, int world_id);
 
   // See WebKit::WebPermissionClient::allowScriptExtension
   // TODO(koz): Remove once WebKit no longer calls this.
   bool AllowScriptExtension(WebKit::WebFrame* frame,
                             const std::string& v8_extension_name,
                             int extension_group);
 
   // TODO(koz): Remove once WebKit no longer calls this.
   bool AllowScriptExtension(WebKit::WebFrame* frame,
                             const std::string& v8_extension_name,
@@ skipping 36 matching lines @@
                        const GURL& event_url);
   void OnDeliverMessage(int target_port_id, const std::string& message);
   void OnSetFunctionNames(const std::vector<std::string>& names);
   void OnLoaded(
       const std::vector<ExtensionMsg_Loaded_Params>& loaded_extensions);
   void OnUnloaded(const std::string& id);
   void OnSetScriptingWhitelist(
       const Extension::ScriptingWhitelist& extension_ids);
   void OnPageActionsUpdated(const std::string& extension_id,
       const std::vector<std::string>& page_actions);
-  void OnActivateApplication(const std::string& extension_id);
   void OnActivateExtension(const std::string& extension_id);
   void OnUpdatePermissions(int reason_id,
                            const std::string& extension_id,
                            const ExtensionAPIPermissionSet& apis,
                            const URLPatternSet& explicit_hosts,
                            const URLPatternSet& scriptable_hosts);
   void OnUpdateUserScripts(base::SharedMemoryHandle table);
   void OnUsingWebRequestAPI(
       bool adblock,
       bool adblock_plus,
       bool other_webrequest);
   void OnShouldClose(const std::string& extension_id, int sequence_id);
 
   // Update the list of active extensions that will be reported when we crash.
   void UpdateActiveExtensions();
 
   // Calls RenderThread's RegisterExtension and keeps tracks of which v8
   // extension is for Chrome Extensions only.
   void RegisterExtension(v8::Extension* extension, bool restrict_to_extensions);
 
   // Sets up the host permissions for |extension|.
   void InitOriginPermissions(const Extension* extension);
   void UpdateOriginPermissions(UpdatedExtensionPermissionsInfo::Reason reason,
                                const Extension* extension,
                                const URLPatternSet& origins);
 
   void RegisterNativeHandlers(ModuleSystem* module_system,
-                              ChromeV8Context* context,
-                              bool is_bindings_allowed);
+                              ChromeV8Context* context);
 
   // Inserts static source code into |source_map_|.
   void PopulateSourceMap();
 
-  // Finds the extension ID for the current context. This is determined from
-  // |world_id| if it's non-zero, or the URL in |frame| if it is.
-  std::string GetExtensionID(WebKit::WebFrame* frame, int world_id);
+  // Returns the type of context that should be created, given an extension ID

[Aaron Boodman, 2012/03/06 01:17:21]

Returns the Feature::Context type for a JavaScript context.

[not at google - send to devlin, 2012/03/06 03:53:00]

Done.

+  // (if any), extension group (if any), and URL info (if any).
+  extensions::Feature::Context ClassifyJavaScriptContext(
+      const std::string& extension_id,
+      int extension_group,
+      const ExtensionURLInfo& url_info);
 
   // True if this renderer is running extensions.
   bool is_extension_process_;
 
   // Contains all loaded extensions.  This is essentially the renderer
   // counterpart to ExtensionService in the browser. It contains information
   // about all extensions currently loaded by the browser.
   ExtensionSet extensions_;
 
   // All the bindings contexts that are currently loaded for this renderer.
   // There is zero or one for each v8 context.
   ChromeV8ContextSet v8_context_set_;
 
   scoped_ptr<UserScriptSlave> user_script_slave_;
 
   // Same as above, but on a longer timer and will run even if the process is
   // not idle, to ensure that IdleHandle gets called eventually.
   base::RepeatingTimer<content::RenderThread> forced_idle_timer_;
 
   // The v8 extensions which are restricted to extension-related contexts.
   std::set<std::string> restricted_v8_extensions_;
 
   // All declared function names.
   std::set<std::string> function_names_;
 
-  // The extensions that are active in this process.
+  // The extensions and apps that are active in this process.
   std::set<std::string> active_extension_ids_;
 
-  // The applications that are active in this process.
-  std::set<std::string> active_application_ids_;
-
   // True once WebKit has been initialized (and it is therefore safe to poke).
   bool is_webkit_initialized_;
 
   std::string test_extension_id_;
 
   // Status of webrequest usage for known extensions.
   // TODO(mpcomplete): remove. http://crbug.com/100411
   bool webrequest_adblock_;
   bool webrequest_adblock_plus_;
   bool webrequest_other_;
 
   ResourceBundleSourceMap source_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionDispatcher);
 };
 
 #endif  // CHROME_RENDERER_EXTENSIONS_EXTENSION_DISPATCHER_H_