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

Unified Diff: ui/views/controls/menu/menu_item_view.cc

Issue 2684993009: Stop MenuItemView From Directly Caching MenuController (Closed)
Patch Set: Created 3 years, 10 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 | « ui/views/controls/menu/menu_item_view.h ('k') | ui/views/controls/menu/submenu_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_item_view.cc
diff --git a/ui/views/controls/menu/menu_item_view.cc b/ui/views/controls/menu/menu_item_view.cc
index 4b2efb01ce99a691e7e489c6f75e835b4178704d..9f16f80694dbdcbf553bbaa5415e21c35ec8eed1 100644
--- a/ui/views/controls/menu/menu_item_view.cc
+++ b/ui/views/controls/menu/menu_item_view.cc
@@ -435,11 +435,11 @@ const MenuItemView::MenuItemDimensions& MenuItemView::GetDimensions() const {
}
MenuController* MenuItemView::GetMenuController() {
- return GetRootMenuItem()->controller_;
+ return GetRootMenuItem()->controller_.get();
}
const MenuController* MenuItemView::GetMenuController() const {
- return GetRootMenuItem()->controller_;
+ return GetRootMenuItem()->controller_.get();
}
MenuDelegate* MenuItemView::GetDelegate() {
« no previous file with comments | « ui/views/controls/menu/menu_item_view.h ('k') | ui/views/controls/menu/submenu_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698