| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/common/extensions/extension.h" | 5 #include "chrome/common/extensions/extension.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/base64.h" | 9 #include "base/base64.h" |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 744 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 755 return result.release(); | 755 return result.release(); |
| 756 } | 756 } |
| 757 | 757 |
| 758 Extension::FileBrowserHandlerList* Extension::LoadFileBrowserHandlers( | 758 Extension::FileBrowserHandlerList* Extension::LoadFileBrowserHandlers( |
| 759 const ListValue* extension_actions, std::string* error) { | 759 const ListValue* extension_actions, std::string* error) { |
| 760 scoped_ptr<FileBrowserHandlerList> result( | 760 scoped_ptr<FileBrowserHandlerList> result( |
| 761 new FileBrowserHandlerList()); | 761 new FileBrowserHandlerList()); |
| 762 for (ListValue::const_iterator iter = extension_actions->begin(); | 762 for (ListValue::const_iterator iter = extension_actions->begin(); |
| 763 iter != extension_actions->end(); | 763 iter != extension_actions->end(); |
| 764 ++iter) { | 764 ++iter) { |
| 765 if (!(*iter)->IsType(Value::TYPE_DICTIONARY)) { | 765 if (!(*iter)->IsDictionary()) { |
| 766 *error = errors::kInvalidFileBrowserHandler; | 766 *error = errors::kInvalidFileBrowserHandler; |
| 767 return NULL; | 767 return NULL; |
| 768 } | 768 } |
| 769 scoped_ptr<FileBrowserHandler> action( | 769 scoped_ptr<FileBrowserHandler> action( |
| 770 LoadFileBrowserHandler( | 770 LoadFileBrowserHandler( |
| 771 reinterpret_cast<DictionaryValue*>(*iter), error)); | 771 reinterpret_cast<DictionaryValue*>(*iter), error)); |
| 772 if (!action.get()) | 772 if (!action.get()) |
| 773 return NULL; // Failed to parse file browser action definition. | 773 return NULL; // Failed to parse file browser action definition. |
| 774 result->push_back(linked_ptr<FileBrowserHandler>(action.release())); | 774 result->push_back(linked_ptr<FileBrowserHandler>(action.release())); |
| 775 } | 775 } |
| (...skipping 2091 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2867 already_disabled(false), | 2867 already_disabled(false), |
| 2868 extension(extension) {} | 2868 extension(extension) {} |
| 2869 | 2869 |
| 2870 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo( | 2870 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo( |
| 2871 const Extension* extension, | 2871 const Extension* extension, |
| 2872 const ExtensionPermissionSet* permissions, | 2872 const ExtensionPermissionSet* permissions, |
| 2873 Reason reason) | 2873 Reason reason) |
| 2874 : reason(reason), | 2874 : reason(reason), |
| 2875 extension(extension), | 2875 extension(extension), |
| 2876 permissions(permissions) {} | 2876 permissions(permissions) {} |
| OLD | NEW |