| Index: chrome/browser/extensions/context_menu_matcher.h
|
| diff --git a/chrome/browser/extensions/context_menu_matcher.h b/chrome/browser/extensions/context_menu_matcher.h
|
| index 19e921c0946857c5c8eeff6dbec2d99f6478ff52..492573cc408d84a04e3f4f426878e7f5440b20ac 100644
|
| --- a/chrome/browser/extensions/context_menu_matcher.h
|
| +++ b/chrome/browser/extensions/context_menu_matcher.h
|
| @@ -8,11 +8,11 @@
|
| #include <stddef.h>
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/extensions/menu_manager.h"
|
| #include "ui/base/models/simple_menu_model.h"
|
|
|
| @@ -107,7 +107,7 @@ class ContextMenuMatcher {
|
| std::map<int, extensions::MenuItem::Id> extension_item_map_;
|
|
|
| // Keep track of and clean up menu models for submenus.
|
| - std::vector<scoped_ptr<ui::SimpleMenuModel>> extension_menu_models_;
|
| + std::vector<std::unique_ptr<ui::SimpleMenuModel>> extension_menu_models_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ContextMenuMatcher);
|
| };
|
|
|