Pull new PPAPI, rename non-P0 interfaces to Dev, rename DeviceContext2D to Gr...

webkit/glue/plugins/pepper_file_chooser.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 "webkit/glue/plugins/pepper_file_chooser.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 14 matching lines @@
 using WebKit::WebFileChooserCompletion;
 using WebKit::WebFileChooserParams;
 using WebKit::WebString;
 using WebKit::WebVector;
 
 namespace pepper {
 
 namespace {
 
 PP_Resource Create(PP_Instance instance_id,
-                   const PP_FileChooserOptions* options) {
+                   const PP_FileChooserOptions_Dev* options) {
   PluginInstance* instance = PluginInstance::FromPPInstance(instance_id);
   if (!instance)
     return 0;
 
   FileChooser* chooser = new FileChooser(instance, options);
   return chooser->GetReference();
 }
 
 bool IsFileChooser(PP_Resource resource) {
   return !!Resource::GetAs<FileChooser>(resource);
@@ skipping 14 matching lines @@
   if (!chooser)
     return 0;
 
   scoped_refptr<FileRef> file_ref(chooser->GetNextChosenFile());
   if (!file_ref)
     return 0;
 
   return file_ref->GetReference();
 }
 
-const PPB_FileChooser ppb_filechooser = {
+const PPB_FileChooser_Dev ppb_filechooser = {
   &Create,
   &IsFileChooser,
   &Show,
   &GetNextChosenFile
 };
 
 class FileChooserCompletionImpl : public WebFileChooserCompletion {
  public:
   FileChooserCompletionImpl(pepper::FileChooser* file_chooser)
       : file_chooser_(file_chooser) {
@@ skipping 10 matching lines @@
     file_chooser_->StoreChosenFiles(files);
   }
 
  private:
   FileChooser* file_chooser_;
 };
 
 }  // namespace
 
 FileChooser::FileChooser(PluginInstance* instance,
-                         const PP_FileChooserOptions* options)
+                         const PP_FileChooserOptions_Dev* options)
     : Resource(instance->module()),
       delegate_(instance->delegate()),
       mode_(options->mode),
       accept_mime_types_(options->accept_mime_types),
       completion_callback_() {
 }
 
 FileChooser::~FileChooser() {
 }
 
 // static
-const PPB_FileChooser* FileChooser::GetInterface() {
+const PPB_FileChooser_Dev* FileChooser::GetInterface() {
   return &ppb_filechooser;
 }
 
 void FileChooser::StoreChosenFiles(const std::vector<std::string>& files) {
   next_chosen_file_index_ = 0;
   std::vector<std::string>::const_iterator end_it = files.end();
   for (std::vector<std::string>::const_iterator it = files.begin();
        it != end_it; it++)
     chosen_files_.push_back(
         new FileRef(module(), PP_FILESYSTEMTYPE_LOCALPERSISTENT, *it, ""));
@@ skipping 22 matching lines @@
 }
 
 scoped_refptr<FileRef> FileChooser::GetNextChosenFile() {
   if (next_chosen_file_index_ >= chosen_files_.size())
     return NULL;
 
   return chosen_files_[next_chosen_file_index_++];
 }
 
 }  // namespace pepper