Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1866)

Unified Diff: chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc

Issue 393943006: MacViews: Remove GetMenu() from MenuRunner. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit test compile Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..f1bc32e5a2f69a619317fa54158d8832595e238c 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,10 @@ 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()));
+ views::MenuItemView* menu_view = menu_adapter_->CreateMenu();
+ menu_runner_.reset(new views::MenuRunner(menu_view, 0));
+ return menu_view;
}
virtual bool IsCommandIdChecked(int command_id) const OVERRIDE {
@@ -473,6 +476,7 @@ class SimpleMenuDelegate : public ui::SimpleMenuModel::Delegate {
private:
scoped_ptr<ui::SimpleMenuModel> menu_model_;
+ scoped_ptr<views::MenuModelAdapter> menu_adapter_;
scoped_ptr<views::MenuRunner> menu_runner_;
DISALLOW_COPY_AND_ASSIGN(SimpleMenuDelegate);
« no previous file with comments | « no previous file | chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698