Revert 50667 - Add in support for internal pepper plugins into the PepperPlug...

remoting/client/plugin/chromoting_plugin.cc

 // Copyright (c) 2010 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.
 
 #include "remoting/client/plugin/chromoting_plugin.h"
 
 #include <string>
 #include <vector>
 
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "remoting/client/chromoting_client.h"
 #include "remoting/client/host_connection.h"
 #include "remoting/client/jingle_host_connection.h"
 #include "remoting/client/plugin/pepper_view.h"
 #include "remoting/jingle_glue/jingle_thread.h"
 #include "third_party/ppapi/c/pp_event.h"
 #include "third_party/ppapi/c/pp_rect.h"
 #include "third_party/ppapi/cpp/image_data.h"
 
 using std::string;
 using std::vector;
 
 namespace remoting {
 
-const char* ChromotingPlugin::kMimeType = "pepper-application/x-chromoting";
+const char* ChromotingPlugin::kMimeType =
+    "pepper-application/x-chromoting-plugin::Chromoting";
 
-ChromotingPlugin::ChromotingPlugin(PP_Instance pp_instance,
-                                   const PPB_Instance* ppb_instance_funcs)
-    : width_(0),
-      height_(0),
-      drawing_context_(NULL),
-      pp_instance_(pp_instance),
-      ppb_instance_funcs_(ppb_instance_funcs) {
+ChromotingPlugin::ChromotingPlugin(PP_Instance instance)
+    : pp::Instance(instance),
+      width_(0),
+      height_(0) {
 }
 
 ChromotingPlugin::~ChromotingPlugin() {
   if (host_connection_.get())
     host_connection_->Disconnect();
 
   // TODO(ajwong): We need to ensure all objects have actually stopped posting
   // to the message loop before this point.  Right now, we don't have a well
   // defined stop for the plugin process, and the thread shutdown is likely a
   // race condition.
   if (network_thread_.get())
     network_thread_->Stop();
 
   if (main_thread_.get())
     main_thread_->Stop();
 }
 
-bool ChromotingPlugin::Init(uint32_t argc, const char* argn[],
-                            const char* argv[]) {
+bool ChromotingPlugin::Init(uint32_t argc, const char* argn[], const char* argv[]) {
   LOG(INFO) << "Started ChromotingPlugin::Init";
 
   // Extract the URL from the arguments.
   const char* url = NULL;
   for (uint32_t i = 0; i < argc; ++i) {
     if (strcmp(argn[i], "src") == 0) {
       url = argv[i];
       break;
     }
   }
@@ skipping 44 matching lines @@
             << position.size.width << ","
             << position.size.height;
 
   // TODO(ajwong): Do we care about the position?  Probably not...
   if (position.size.width == width_ || position.size.height == height_)
     return;
 
   width_ = position.size.width;
   height_ = position.size.height;
 
-  /*
-   * TODO(ajwong): Reenable this code once we fingure out how we want to
-   * abstract away the C-api for DeviceContext2D.
   device_context_ = pp::DeviceContext2D(width_, height_, false);
-  if (!ppb_instance_funcs_->BindGraphicsDeviceContext(
-      pp_instance_,
-      device_context_.pp_resource())) {
+  if (!BindGraphicsDeviceContext(device_context_)) {
     LOG(ERROR) << "Couldn't bind the device context.";
     return;
   }
 
   pp::ImageData image(PP_IMAGEDATAFORMAT_BGRA_PREMUL, width_, height_, false);
   if (!image.is_null()) {
     for (int y = 0; y < image.height(); y++) {
       for (int x = 0; x < image.width(); x++) {
         *image.GetAddr32(x, y) = 0xccff00cc;
       }
     }
     device_context_.ReplaceContents(&image);
     device_context_.Flush(NULL, this);
   } else {
     LOG(ERROR) << "Unable to allocate image.";
   }
-  */
 
   //client_->SetViewport(0, 0, width_, height_);
   //client_->Repaint();
 }
 
 bool ChromotingPlugin::HandleEvent(const PP_Event& event) {
   switch (event.type) {
     case PP_Event_Type_MouseDown:
     case PP_Event_Type_MouseUp:
     case PP_Event_Type_MouseMove:
@@ skipping 44 matching lines @@
   pos = parts[2].rfind('=');
   if (pos == string::npos && (pos + 1) != string::npos) {
     return false;
   }
   host_jid->assign(parts[2].substr(pos + 1));
 
   return true;
 }
 
 }  // namespace remoting