| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 | 30 |
| 31 #include "platform/plugins/PluginListBuilder.h" | 31 #include "platform/plugins/PluginListBuilder.h" |
| 32 | 32 |
| 33 #include "public/platform/WebString.h" | 33 #include "public/platform/WebString.h" |
| 34 | 34 |
| 35 namespace blink { | 35 namespace blink { |
| 36 | 36 |
| 37 void PluginListBuilder::AddPlugin(const WebString& name, | 37 void PluginListBuilder::AddPlugin(const WebString& name, |
| 38 const WebString& description, | 38 const WebString& description, |
| 39 const WebString& file_name) { | 39 const WebString& file_name) { |
| 40 PluginInfo info; | 40 if (results_) |
| 41 info.name = name; | 41 results_->push_back(new PluginInfo(name, file_name, description)); |
| 42 info.desc = description; | |
| 43 info.file = file_name; | |
| 44 results_->push_back(info); | |
| 45 } | 42 } |
| 46 | 43 |
| 47 void PluginListBuilder::AddMediaTypeToLastPlugin(const WebString& name, | 44 void PluginListBuilder::AddMediaTypeToLastPlugin(const WebString& name, |
| 48 const WebString& description) { | 45 const WebString& description) { |
| 49 MimeClassInfo info; | 46 if (results_) { |
| 50 info.type = name; | 47 MimeClassInfo* info = |
| 51 info.desc = description; | 48 new MimeClassInfo(name, description, *results_->back()); |
| 52 results_->back().mimes.push_back(info); | 49 results_->back()->AddMimeType(info); |
| 50 } |
| 53 } | 51 } |
| 54 | 52 |
| 55 void PluginListBuilder::AddFileExtensionToLastMediaType( | 53 void PluginListBuilder::AddFileExtensionToLastMediaType( |
| 56 const WebString& extension) { | 54 const WebString& extension) { |
| 57 MimeClassInfo& info = results_->back().mimes.back(); | 55 if (results_) { |
| 58 info.extensions.push_back(extension); | 56 MimeClassInfo& info = *results_->back()->mimes_.back(); |
| 57 info.extensions_.push_back(extension); |
| 58 } |
| 59 } | 59 } |
| 60 | 60 |
| 61 } // namespace blink | 61 } // namespace blink |
| OLD | NEW |