Remove webkit::ppapi::Resource.

webkit/plugins/ppapi/ppb_flash_menu_impl.cc

 // Copyright (c) 2011 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 "webkit/plugins/ppapi/ppb_flash_menu_impl.h"
 
 #include "base/utf_string_conversions.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ui/gfx/point.h"
 #include "webkit/glue/webmenuitem.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
+#include "webkit/plugins/ppapi/resource_helper.h"
 
 using ::ppapi::thunk::PPB_Flash_Menu_API;
 
 namespace webkit {
 namespace ppapi {
 
 namespace {
 
 // Maximum depth of submenus allowed (e.g., 1 indicates that submenus are
 // allowed, but not sub-submenus).
@@ skipping 62 matching lines @@
     }
 
     out_menu->push_back(item);
   }
 
   return true;
 }
 
 }  // namespace
 
-PPB_Flash_Menu_Impl::PPB_Flash_Menu_Impl(PluginInstance* instance)
+PPB_Flash_Menu_Impl::PPB_Flash_Menu_Impl(PP_Instance instance)
     : Resource(instance) {
 }
 
 PPB_Flash_Menu_Impl::~PPB_Flash_Menu_Impl() {
 }
 
 // static
-PP_Resource PPB_Flash_Menu_Impl::Create(PluginInstance* instance,
+PP_Resource PPB_Flash_Menu_Impl::Create(PP_Instance instance,
                                         const PP_Flash_Menu* menu_data) {
   scoped_refptr<PPB_Flash_Menu_Impl> menu(new PPB_Flash_Menu_Impl(instance));
   if (!menu->Init(menu_data))
     return 0;
   return menu->GetReference();
 }
 
 bool PPB_Flash_Menu_Impl::Init(const PP_Flash_Menu* menu_data) {
   menu_id_map_.clear();
   menu_id_map_.push_back(0);  // Reserve |menu_id_map_[0]|.
@@ skipping 18 matching lines @@
     return PP_ERROR_BADARGUMENT;
 
   if (!callback.func) {
     NOTIMPLEMENTED();
     return PP_ERROR_BADARGUMENT;
   }
 
   if (callback_.get() && !callback_->completed())
     return PP_ERROR_INPROGRESS;
 
-  int32_t rv = instance()->delegate()->ShowContextMenu(
-      instance(), this, gfx::Point(location->x, location->y));
+  PluginInstance* plugin_instance = ResourceHelper::GetPluginInstance(this);
+  if (!plugin_instance)
+    return false;
+
+  int32_t rv = plugin_instance->delegate()->ShowContextMenu(
+      plugin_instance, this, gfx::Point(location->x, location->y));
   if (rv == PP_OK_COMPLETIONPENDING) {
     // Record callback and output buffers.
     callback_ = new TrackedCompletionCallback(
-        instance()->module()->GetCallbackTracker(), pp_resource(), callback);
+        plugin_instance->module()->GetCallbackTracker(),
+        pp_resource(), callback);
     selected_id_out_ = selected_id_out;
   } else {
     // This should never be completed synchronously successfully.
     DCHECK_NE(rv, PP_OK);
   }
   return rv;
 
   NOTIMPLEMENTED();
   return PP_ERROR_FAILED;
 }
@@ skipping 19 matching lines @@
 
   scoped_refptr<TrackedCompletionCallback> callback;
   callback.swap(callback_);
   selected_id_out_ = NULL;
 
   callback->Run(rv);  // Will complete abortively if necessary.
 }
 
 }  // namespace ppapi
 }  // namespace webkit