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

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: Implemented reviewer suggestions. 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
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..7f011d9dddb10e5b7ea8d9baabffd17fe82eb1b0 100644
--- a/chrome/browser/chromeos/status/network_menu.h
+++ b/chrome/browser/chromeos/status/network_menu.h
@@ -28,9 +28,14 @@ namespace gfx {
class Canvas;
}
+namespace ui {
+class MenuModel;
+}
+
namespace views {
class MenuItemView;
class MenuButton;
+class MenuModelAdapter;
}
namespace chromeos {
@@ -81,6 +86,9 @@ class NetworkMenu {
NetworkMenu(Delegate* delegate, bool is_browser_mode);
virtual ~NetworkMenu();
+ // Access to menu definition.
+ ui::MenuModel* GetMenuModel();
+
// Cancels the active menu.
void CancelMenu();
@@ -113,8 +121,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') | chrome/browser/ui/views/menu_model_adapter_test.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698