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

Unified Diff: chrome/browser/chromeos/status/network_menu.h

Issue 7541002: Make NetworkMenuModel a ui::MenuModel again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Better fix for NOTREACHED(). Created 9 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/chromeos/status/network_menu.cc » ('j') | views/controls/menu/menu_item_view.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/status/network_menu.h
diff --git a/chrome/browser/chromeos/status/network_menu.h b/chrome/browser/chromeos/status/network_menu.h
index 030d79acb1c7c595dc8c951b225f71f924785561..f0423edcecf188794862a69baaf4bbb251b283e3 100644
--- a/chrome/browser/chromeos/status/network_menu.h
+++ b/chrome/browser/chromeos/status/network_menu.h
@@ -31,6 +31,7 @@ class Canvas;
namespace views {
class MenuItemView;
class MenuButton;
+class MenuModelAdapter;
}
namespace chromeos {
@@ -113,8 +114,9 @@ class NetworkMenu {
bool refreshing_menu_;
// The network menu.
- scoped_ptr<views::MenuItemView> menu_item_view_;
scoped_ptr<NetworkMenuModel> main_menu_model_;
+ scoped_ptr<views::MenuModelAdapter> menu_model_adapter_;
+ scoped_ptr<views::MenuItemView> menu_item_view_;
// Holds minimum width of the menu.
int min_width_;
« no previous file with comments | « no previous file | chrome/browser/chromeos/status/network_menu.cc » ('j') | views/controls/menu/menu_item_view.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698