| Index: ui/views/controls/menu/menu_runner.h
|
| diff --git a/ui/views/controls/menu/menu_runner.h b/ui/views/controls/menu/menu_runner.h
|
| index ea2438ee980c635b7864823cbde08a7cd507f307..5d98ec0e1bba839f731e033ca6683e8f0559a92f 100644
|
| --- a/ui/views/controls/menu/menu_runner.h
|
| +++ b/ui/views/controls/menu/menu_runner.h
|
| @@ -7,9 +7,10 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "ui/base/ui_base_types.h"
|
| #include "ui/views/controls/menu/menu_types.h"
|
| #include "ui/views/views_export.h"
|
| @@ -135,7 +136,7 @@ class VIEWS_EXPORT MenuRunner {
|
| friend class test::MenuRunnerTestAPI;
|
|
|
| // Sets an implementation of RunMenuAt. This is intended to be used at test.
|
| - void SetRunnerHandler(scoped_ptr<MenuRunnerHandler> runner_handler);
|
| + void SetRunnerHandler(std::unique_ptr<MenuRunnerHandler> runner_handler);
|
|
|
| const int32_t run_types_;
|
|
|
| @@ -144,9 +145,9 @@ class VIEWS_EXPORT MenuRunner {
|
|
|
| // An implementation of RunMenuAt. This is usually NULL and ignored. If this
|
| // is not NULL, this implementation will be used.
|
| - scoped_ptr<MenuRunnerHandler> runner_handler_;
|
| + std::unique_ptr<MenuRunnerHandler> runner_handler_;
|
|
|
| - scoped_ptr<internal::DisplayChangeListener> display_change_listener_;
|
| + std::unique_ptr<internal::DisplayChangeListener> display_change_listener_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MenuRunner);
|
| };
|
|
|