| Index: chrome/common/extensions/api/extension_action/action_info.h
|
| diff --git a/chrome/common/extensions/api/extension_action/action_info.h b/chrome/common/extensions/api/extension_action/action_info.h
|
| index 1e2001d4e2b310ef2df0cafdca1379097d20e005..11f4cfdee87f1ce939d637814969124c700f65db 100644
|
| --- a/chrome/common/extensions/api/extension_action/action_info.h
|
| +++ b/chrome/common/extensions/api/extension_action/action_info.h
|
| @@ -5,6 +5,7 @@
|
| #ifndef CHROME_COMMON_EXTENSIONS_API_EXTENSION_ACTION_ACTION_INFO_H_
|
| #define CHROME_COMMON_EXTENSIONS_API_EXTENSION_ACTION_ACTION_INFO_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/strings/string16.h"
|
| @@ -33,9 +34,9 @@ struct ActionInfo {
|
| };
|
|
|
| // Loads an ActionInfo from the given DictionaryValue.
|
| - static scoped_ptr<ActionInfo> Load(const Extension* extension,
|
| - const base::DictionaryValue* dict,
|
| - base::string16* error);
|
| + static std::unique_ptr<ActionInfo> Load(const Extension* extension,
|
| + const base::DictionaryValue* dict,
|
| + base::string16* error);
|
|
|
| // Returns the extension's browser action, if any.
|
| static const ActionInfo* GetBrowserActionInfo(const Extension* extension);
|
|
|