diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-05 03:55:45 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-05 03:55:45 +0000 |
| commit | 52aac9e4ff1d4181f1b980a29446fdf5036a185a (patch) | |
| tree | 8d970acf8b45bf33f10d40e5298c33c313dcfa70 /chrome/browser/gtk/menu_gtk.cc | |
| parent | 4ce7e15da651c6221720e33dc8c500830d4b6b8a (diff) | |
| download | chromium_src-52aac9e4ff1d4181f1b980a29446fdf5036a185a.zip chromium_src-52aac9e4ff1d4181f1b980a29446fdf5036a185a.tar.gz chromium_src-52aac9e4ff1d4181f1b980a29446fdf5036a185a.tar.bz2 | |
Add icons to SimpleMenuModel.
Also get rid of one of the MenuGtk constructors (now down to 2).
Also, stamp out one more use of MenuGtk::Delegate as a controller class.
BUG=31365
TEST=manual (in debug mode) + trybots
Review URL: http://codereview.chromium.org/1915004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/menu_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/menu_gtk.cc | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/chrome/browser/gtk/menu_gtk.cc b/chrome/browser/gtk/menu_gtk.cc index 7670b6c..1e9a8e7 100644 --- a/chrome/browser/gtk/menu_gtk.cc +++ b/chrome/browser/gtk/menu_gtk.cc @@ -117,16 +117,6 @@ MenuGtk::MenuGtk(MenuGtk::Delegate* delegate, BuildMenuIn(menu_, menu_data); } -MenuGtk::MenuGtk(MenuGtk::Delegate* delegate) - : delegate_(delegate), - model_(NULL), - dummy_accel_group_(gtk_accel_group_new()), - menu_(gtk_menu_new()), - factory_(this) { - g_object_ref_sink(menu_); - ConnectSignalHandlers(); -} - MenuGtk::MenuGtk(MenuGtk::Delegate* delegate, menus::MenuModel* model) : delegate_(delegate), @@ -134,11 +124,10 @@ MenuGtk::MenuGtk(MenuGtk::Delegate* delegate, dummy_accel_group_(gtk_accel_group_new()), menu_(gtk_menu_new()), factory_(this) { - g_object_ref_sink(menu_); DCHECK(model); + g_object_ref_sink(menu_); ConnectSignalHandlers(); - if (model) - BuildMenuFromModel(); + BuildMenuFromModel(); } MenuGtk::~MenuGtk() { |