Implement flash menu and net connector resources using the API/thunk model.

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"
 
+using ::ppapi::thunk::PPB_Flash_Menu_API;
+
 namespace webkit {
 namespace ppapi {
 
 namespace {
 
-PP_Resource Create(PP_Instance instance_id, const PP_Flash_Menu* menu_data) {
-  PluginInstance* instance = ResourceTracker::Get()->GetInstance(instance_id);
-  if (!instance)
-    return 0;
-
-  scoped_refptr<PPB_Flash_Menu_Impl> menu(new PPB_Flash_Menu_Impl(instance));
-  if (!menu->Init(menu_data))
-    return 0;
-
-  return menu->GetReference();
-}
-
-PP_Bool IsFlashMenu(PP_Resource resource) {
-  return BoolToPPBool(!!Resource::GetAs<PPB_Flash_Menu_Impl>(resource));
-}
-
-int32_t Show(PP_Resource menu_id,
-             const PP_Point* location,
-             int32_t* selected_id,
-             PP_CompletionCallback callback) {
-  scoped_refptr<PPB_Flash_Menu_Impl> menu(
-      Resource::GetAs<PPB_Flash_Menu_Impl>(menu_id));
-  if (!menu.get())
-    return PP_ERROR_BADRESOURCE;
-
-  return menu->Show(location, selected_id, callback);
-}
-
-const PPB_Flash_Menu ppb_flash_menu = {
-  &Create,
-  &IsFlashMenu,
-  &Show,
-};
-
 // Maximum depth of submenus allowed (e.g., 1 indicates that submenus are
 // allowed, but not sub-submenus).
 const size_t kMaxMenuDepth = 2;
 
 // Maximum number of entries in any single menu (including separators).
 const size_t kMaxMenuEntries = 50;
 
 // Maximum total number of entries in the |menu_id_map| (see below).
 // (Limit to 500 real entries; reserve the 0 action as an invalid entry.)
 const size_t kMaxMenuIdMapEntries = 501;
@@ skipping 58 matching lines @@
 
   return true;
 }
 
 }  // namespace
 
 PPB_Flash_Menu_Impl::PPB_Flash_Menu_Impl(PluginInstance* instance)
     : Resource(instance) {
 }
 
+PPB_Flash_Menu_Impl::~PPB_Flash_Menu_Impl() {
+}
+
+// static
+PP_Resource PPB_Flash_Menu_Impl::Create(PP_Instance pp_instance,
+                                        const PP_Flash_Menu* menu_data) {
+  PluginInstance* instance = ResourceTracker::Get()->GetInstance(pp_instance);
+  if (!instance)
+    return 0;
+
+  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]|.
   if (!ConvertMenuData(menu_data, 0, &menu_data_, &menu_id_map_)) {
     menu_id_map_.clear();
     return false;
   }
 
   return true;
 }
 
-PPB_Flash_Menu_Impl::~PPB_Flash_Menu_Impl() {
-}
-
-// static
-const PPB_Flash_Menu* PPB_Flash_Menu_Impl::GetInterface() {
-  return &ppb_flash_menu;
-}
-
-PPB_Flash_Menu_Impl* PPB_Flash_Menu_Impl::AsPPB_Flash_Menu_Impl() {
+PPB_Flash_Menu_API* PPB_Flash_Menu_Impl::AsPPB_Flash_Menu_API() {
   return this;
 }
 
 int32_t PPB_Flash_Menu_Impl::Show(const PP_Point* location,
                                   int32_t* selected_id_out,
                                   PP_CompletionCallback callback) {
   // |location| is not (currently) optional.
   // TODO(viettrungluu): Make it optional and default to the current mouse pos?
   if (!location)
     return PP_ERROR_BADARGUMENT;
@@ skipping 50 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