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

Side by Side Diff: chrome/renderer/extensions/extension_dispatcher.h

Issue 8872053: Add world_id parameter to ExtensionDispatcher::AllowScriptExecution(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix compile Created 9 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_RENDERER_EXTENSIONS_EXTENSION_DISPATCHER_H_ 5 #ifndef CHROME_RENDERER_EXTENSIONS_EXTENSION_DISPATCHER_H_
6 #define CHROME_RENDERER_EXTENSIONS_EXTENSION_DISPATCHER_H_ 6 #define CHROME_RENDERER_EXTENSIONS_EXTENSION_DISPATCHER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 const ExtensionSet* extensions() const { return &extensions_; } 49 const ExtensionSet* extensions() const { return &extensions_; }
50 const ChromeV8ContextSet& v8_context_set() const { 50 const ChromeV8ContextSet& v8_context_set() const {
51 return v8_context_set_; 51 return v8_context_set_;
52 } 52 }
53 UserScriptSlave* user_script_slave() { return user_script_slave_.get(); } 53 UserScriptSlave* user_script_slave() { return user_script_slave_.get(); }
54 54
55 bool IsApplicationActive(const std::string& extension_id) const; 55 bool IsApplicationActive(const std::string& extension_id) const;
56 bool IsExtensionActive(const std::string& extension_id) const; 56 bool IsExtensionActive(const std::string& extension_id) const;
57 57
58 // See WebKit::WebPermissionClient::allowScriptExtension 58 // See WebKit::WebPermissionClient::allowScriptExtension
59 // TODO(koz): Remove once WebKit no longer calls this.
59 bool AllowScriptExtension(WebKit::WebFrame* frame, 60 bool AllowScriptExtension(WebKit::WebFrame* frame,
60 const std::string& v8_extension_name, 61 const std::string& v8_extension_name,
61 int extension_group); 62 int extension_group);
62 63
64 bool AllowScriptExtension(WebKit::WebFrame* frame,
65 const std::string& v8_extension_name,
66 int extension_group,
67 int world_id);
68
63 void DidCreateScriptContext(WebKit::WebFrame* frame, 69 void DidCreateScriptContext(WebKit::WebFrame* frame,
64 v8::Handle<v8::Context> context, 70 v8::Handle<v8::Context> context,
65 int world_id); 71 int world_id);
66 void WillReleaseScriptContext(WebKit::WebFrame* frame, 72 void WillReleaseScriptContext(WebKit::WebFrame* frame,
67 v8::Handle<v8::Context> context, 73 v8::Handle<v8::Context> context,
68 int world_id); 74 int world_id);
69 75
70 void SetTestExtensionId(const std::string& extension_id); 76 void SetTestExtensionId(const std::string& extension_id);
71 77
72 // TODO(mpcomplete): remove. http://crbug.com/100411 78 // TODO(mpcomplete): remove. http://crbug.com/100411
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 // Status of webrequest usage for known extensions. 175 // Status of webrequest usage for known extensions.
170 // TODO(mpcomplete): remove. http://crbug.com/100411 176 // TODO(mpcomplete): remove. http://crbug.com/100411
171 bool webrequest_adblock_; 177 bool webrequest_adblock_;
172 bool webrequest_adblock_plus_; 178 bool webrequest_adblock_plus_;
173 bool webrequest_other_; 179 bool webrequest_other_;
174 180
175 DISALLOW_COPY_AND_ASSIGN(ExtensionDispatcher); 181 DISALLOW_COPY_AND_ASSIGN(ExtensionDispatcher);
176 }; 182 };
177 183
178 #endif // CHROME_RENDERER_EXTENSIONS_EXTENSION_DISPATCHER_H_ 184 #endif // CHROME_RENDERER_EXTENSIONS_EXTENSION_DISPATCHER_H_
OLDNEW
« no previous file with comments | « chrome/renderer/chrome_render_view_observer.cc ('k') | chrome/renderer/extensions/extension_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698