diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 22:00:15 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 22:00:15 +0000 |
| commit | b13ee95c87248d64609cecf16797b8953556b032 (patch) | |
| tree | 6cfcda4644c8f0d30c48b328fbd544b53c486e42 /views | |
| parent | aeebf8dc9da277473b9d20e0d736bdb29c9f526a (diff) | |
| download | chromium_src-b13ee95c87248d64609cecf16797b8953556b032.zip chromium_src-b13ee95c87248d64609cecf16797b8953556b032.tar.gz chromium_src-b13ee95c87248d64609cecf16797b8953556b032.tar.bz2 | |
Revert 76808 - Fix Clang errors in profile_menu_model and menu_2.
BUG=none
TEST=Clang bots are happy.
Review URL: http://codereview.chromium.org/6613028
TBR=mirandac@chromium.org
Review URL: http://codereview.chromium.org/6613031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76813 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/menu/menu_2.cc | 3 | ||||
| -rw-r--r-- | views/controls/menu/menu_2.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/views/controls/menu/menu_2.cc b/views/controls/menu/menu_2.cc index 388b4e9..f64f275 100644 --- a/views/controls/menu/menu_2.cc +++ b/views/controls/menu/menu_2.cc @@ -16,9 +16,6 @@ Menu2::Menu2(ui::MenuModel* model) Rebuild(); } -Menu2::~Menu2() { -} - gfx::NativeMenu Menu2::GetNativeMenu() const { return wrapper_->GetNativeMenu(); } diff --git a/views/controls/menu/menu_2.h b/views/controls/menu/menu_2.h index 7204120..8916b7c 100644 --- a/views/controls/menu/menu_2.h +++ b/views/controls/menu/menu_2.h @@ -33,7 +33,7 @@ class Menu2 { // MyClass : menu_(this) {} // is likely to have problems. explicit Menu2(ui::MenuModel* model); - virtual ~Menu2(); + virtual ~Menu2() {} // How the menu is aligned relative to the point it is shown at. // The alignment is reversed by menu if text direction is right to left. |