| Index: chrome/renderer/extensions/chrome_v8_context.h
|
| diff --git a/chrome/renderer/extensions/chrome_v8_context.h b/chrome/renderer/extensions/chrome_v8_context.h
|
| index 7138b0c8d7d339fa26ed5ab8192e6c2896e5b97f..fff47e4e34db63cc070a71ee1cce415cc0478553 100644
|
| --- a/chrome/renderer/extensions/chrome_v8_context.h
|
| +++ b/chrome/renderer/extensions/chrome_v8_context.h
|
| @@ -10,6 +10,7 @@
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| #include "chrome/renderer/extensions/module_system.h"
|
| +#include "chrome/renderer/extensions/pepper_request_proxy.h"
|
| #include "chrome/renderer/extensions/request_sender.h"
|
| #include "chrome/renderer/extensions/safe_builtins.h"
|
| #include "chrome/renderer/extensions/scoped_persistent.h"
|
| @@ -75,6 +76,10 @@ class ChromeV8Context : public RequestSender::Source {
|
| return &safe_builtins_;
|
| }
|
|
|
| + PepperRequestProxy* pepper_request_proxy() {
|
| + return pepper_request_proxy_.get();
|
| + }
|
| +
|
| // Returns the ID of the extension associated with this context, or empty
|
| // string if there is no such extension.
|
| std::string GetExtensionID() const;
|
| @@ -141,6 +146,9 @@ class ChromeV8Context : public RequestSender::Source {
|
| // Contains safe copies of builtin objects like Function.prototype.
|
| SafeBuiltins safe_builtins_;
|
|
|
| + // The proxy for this context for making API calls from Pepper via Javascript.
|
| + scoped_ptr<PepperRequestProxy> pepper_request_proxy_;
|
| +
|
| v8::Isolate* isolate_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ChromeV8Context);
|
|
|