| Index: chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
|
| diff --git a/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
|
| index fc3ea10f468a3533c94fc9364b3ffd2e9acdf040..7b308367fdcb29befddee9384d0f5e2e227f5584 100644
|
| --- a/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
|
| +++ b/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
|
| @@ -18,6 +18,7 @@
|
| #include "ui/views/controls/button/label_button.h"
|
| #include "ui/views/controls/label.h"
|
| #include "ui/views/controls/menu/menu_item_view.h"
|
| +#include "ui/views/controls/menu/menu_model_adapter.h"
|
| #include "ui/views/controls/menu/menu_runner.h"
|
| #include "ui/views/controls/menu/submenu_view.h"
|
| #include "ui/views/layout/grid_layout.h"
|
| @@ -446,8 +447,9 @@ class SimpleMenuDelegate : public ui::SimpleMenuModel::Delegate {
|
| menu_model_->AddSeparator(ui::NORMAL_SEPARATOR);
|
| menu_model_->AddItem(IDC_MENU_ITEM_3, ASCIIToUTF16("Item 3"));
|
|
|
| - menu_runner_.reset(new views::MenuRunner(menu_model_.get(), 0));
|
| - return menu_runner_->GetMenu();
|
| + menu_adapter_.reset(new views::MenuModelAdapter(menu_model_.get()));
|
| + menu_view_.reset(menu_adapter->CreateMenu());
|
| + return menu_view_.get();
|
| }
|
|
|
| virtual bool IsCommandIdChecked(int command_id) const OVERRIDE {
|
| @@ -473,7 +475,7 @@ class SimpleMenuDelegate : public ui::SimpleMenuModel::Delegate {
|
|
|
| private:
|
| scoped_ptr<ui::SimpleMenuModel> menu_model_;
|
| - scoped_ptr<views::MenuRunner> menu_runner_;
|
| + scoped_ptr<views::MenuModelAdapter> menu_adapter_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SimpleMenuDelegate);
|
| };
|
|
|