| Index: remoting/client/plugin/chromoting_plugin.h
|
| diff --git a/remoting/client/plugin/chromoting_plugin.h b/remoting/client/plugin/chromoting_plugin.h
|
| index 3bd04702ffc0db31ab592e4cd209d5414cd529d6..d613a97fa6081c7fce77dd1f2f80327d322f58b0 100644
|
| --- a/remoting/client/plugin/chromoting_plugin.h
|
| +++ b/remoting/client/plugin/chromoting_plugin.h
|
| @@ -12,6 +12,7 @@
|
|
|
| #include "base/at_exit.h"
|
| #include "base/scoped_ptr.h"
|
| +#include "remoting/client/client_context.h"
|
| #include "remoting/client/host_connection.h"
|
| #include "testing/gtest/include/gtest/gtest_prod.h"
|
| #include "third_party/ppapi/c/pp_event.h"
|
| @@ -20,6 +21,7 @@
|
| #include "third_party/ppapi/c/pp_resource.h"
|
| #include "third_party/ppapi/cpp/instance.h"
|
| #include "third_party/ppapi/cpp/device_context_2d.h"
|
| +#include "third_party/ppapi/cpp/var.h"
|
|
|
| class MessageLoop;
|
|
|
| @@ -49,13 +51,14 @@ class ChromotingPlugin : public pp::Instance {
|
| virtual ~ChromotingPlugin();
|
|
|
| virtual bool Init(uint32_t argc, const char* argn[], const char* argv[]);
|
| + virtual void Connect(const ClientConfig& config);
|
| virtual bool HandleEvent(const PP_Event& event);
|
| - virtual void ViewChanged(const PP_Rect& position, const PP_Rect& clip);
|
| + virtual pp::Var GetInstanceObject();
|
| + virtual void ViewChanged(const pp::Rect& position, const pp::Rect& clip);
|
|
|
| virtual bool CurrentlyOnPluginThread() const;
|
|
|
| private:
|
| - FRIEND_TEST(ChromotingPluginTest, ParseUrl);
|
| FRIEND_TEST(ChromotingPluginTest, TestCaseSetup);
|
|
|
| // Since we're an internal plugin, we can just grab the message loop during
|
| @@ -66,15 +69,12 @@ class ChromotingPlugin : public pp::Instance {
|
| // TODO(ajwong): Think if there is a better way to safeguard this.
|
| MessageLoop* pepper_main_loop_dont_post_to_me_;
|
|
|
| - scoped_ptr<ClientContext> context_;
|
| -
|
| + ClientContext context_;
|
| scoped_ptr<HostConnection> host_connection_;
|
| -
|
| scoped_ptr<PepperView> view_;
|
| -
|
| scoped_ptr<InputHandler> input_handler_;
|
| -
|
| scoped_ptr<ChromotingClient> client_;
|
| + pp::Var instance_object_; // JavaScript interface to control this instance.
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ChromotingPlugin);
|
| };
|
|
|