Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1700)

Unified Diff: chrome/renderer/extensions/extension_dispatcher.h

Issue 9460002: Convert app_bindings.js to the schema_generated_bindings.js infrastructure. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: aa comments Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/extensions/extension_dispatcher.h
diff --git a/chrome/renderer/extensions/extension_dispatcher.h b/chrome/renderer/extensions/extension_dispatcher.h
index 6e89a058680546bcbee3a5a4b2e931a1d3050da9..75be12ef22836ba1a1788e43bbe6305e103a25a2 100644
--- a/chrome/renderer/extensions/extension_dispatcher.h
+++ b/chrome/renderer/extensions/extension_dispatcher.h
@@ -14,6 +14,7 @@
#include "base/timer.h"
#include "content/public/renderer/render_process_observer.h"
#include "chrome/common/extensions/extension_set.h"
+#include "chrome/renderer/extensions/chrome_v8_context.h"
#include "chrome/renderer/extensions/chrome_v8_context_set.h"
#include "v8/include/v8.h"
@@ -52,7 +53,6 @@ class ExtensionDispatcher : public content::RenderProcessObserver {
}
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;
// See WebKit::WebPermissionClient::allowScriptExtension
@@ -112,7 +112,6 @@ class ExtensionDispatcher : public content::RenderProcessObserver {
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,
@@ -142,6 +141,11 @@ class ExtensionDispatcher : public content::RenderProcessObserver {
// |world_id| if it's non-zero, or the URL in |frame| if it is.
std::string GetExtensionID(WebKit::WebFrame* frame, int world_id);
+ // Gets the type of context that would be created for a v8 extension group
+ // on a frame.
+ ChromeV8Context::ContextType GetContextType(int extension_group,
+ WebKit::WebFrame* frame);
+
// True if this renderer is running extensions.
bool is_extension_process_;
@@ -166,12 +170,9 @@ class ExtensionDispatcher : public content::RenderProcessObserver {
// 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_;

Powered by Google App Engine
This is Rietveld 408576698