Fix clang build for http://codereview.chromium.org/7067032/.

BUG=none
TBR=sky

Review URL: http://codereview.chromium.org/6987030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86686 0039d316-1c4b-4281-b951-d872f2087c98
parent fc9bc053
...@@ -17,6 +17,9 @@ MenuModelAdapter::MenuModelAdapter(ui::MenuModel* menu_model) ...@@ -17,6 +17,9 @@ MenuModelAdapter::MenuModelAdapter(ui::MenuModel* menu_model)
DCHECK(menu_model); DCHECK(menu_model);
} }
MenuModelAdapter::~MenuModelAdapter() {
}
void MenuModelAdapter::BuildMenu(MenuItemView* menu) { void MenuModelAdapter::BuildMenu(MenuItemView* menu) {
DCHECK(menu); DCHECK(menu);
......
...@@ -25,6 +25,7 @@ class MenuModelAdapter : public MenuDelegate { ...@@ -25,6 +25,7 @@ class MenuModelAdapter : public MenuDelegate {
// must ensure it exists for the lifetime of the adapter. The // must ensure it exists for the lifetime of the adapter. The
// base_id argument is the command id for the first menu item. // base_id argument is the command id for the first menu item.
explicit MenuModelAdapter(ui::MenuModel* menu_model); explicit MenuModelAdapter(ui::MenuModel* menu_model);
virtual ~MenuModelAdapter();
// Populate a MenuItemView menu with the ui::MenuModel items // Populate a MenuItemView menu with the ui::MenuModel items
// (including submenus). // (including submenus).
......
...@@ -26,6 +26,9 @@ class MenuModelBase : public ui::MenuModel { ...@@ -26,6 +26,9 @@ class MenuModelBase : public ui::MenuModel {
last_activation_(-1) { last_activation_(-1) {
} }
virtual ~MenuModelBase() {
}
// ui::MenuModel implementation: // ui::MenuModel implementation:
virtual bool HasIcons() const OVERRIDE { virtual bool HasIcons() const OVERRIDE {
...@@ -157,6 +160,9 @@ class SubmenuModel : public MenuModelBase { ...@@ -157,6 +160,9 @@ class SubmenuModel : public MenuModelBase {
items_.push_back(Item(TYPE_COMMAND, "submenu item 1", NULL)); items_.push_back(Item(TYPE_COMMAND, "submenu item 1", NULL));
} }
virtual ~SubmenuModel() {
}
private: private:
DISALLOW_COPY_AND_ASSIGN(SubmenuModel); DISALLOW_COPY_AND_ASSIGN(SubmenuModel);
}; };
...@@ -173,6 +179,9 @@ class RootModel : public MenuModelBase { ...@@ -173,6 +179,9 @@ class RootModel : public MenuModelBase {
items_.push_back(Item(TYPE_RADIO, "radio 4", NULL)); items_.push_back(Item(TYPE_RADIO, "radio 4", NULL));
} }
virtual ~RootModel() {
}
private: private:
scoped_ptr<MenuModel> submenu_model_; scoped_ptr<MenuModel> submenu_model_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment