diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-16 22:10:46 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-16 22:10:46 +0000 |
commit | 080440cebdc80def86dd88356e5922946cc11a79 (patch) | |
tree | 6da09cd9a2b69e79075f0d391179d0757ac04620 /views/controls/tabbed_pane | |
parent | bc9b2f4215e0ee88e0faaa42a1f116231ce2a311 (diff) | |
download | chromium_src-080440cebdc80def86dd88356e5922946cc11a79.zip chromium_src-080440cebdc80def86dd88356e5922946cc11a79.tar.gz chromium_src-080440cebdc80def86dd88356e5922946cc11a79.tar.bz2 |
Fix even more crashes. To help identify remaining crashes now and in the future, I have made the GetWidget methods on WidgetDelegate pure virtual. This will cause classes that don't define them to fail compile instead of crashing at run time.
http://crbug.com/86119
TEST=none
Review URL: http://codereview.chromium.org/7189019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89409 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/tabbed_pane')
-rw-r--r-- | views/controls/tabbed_pane/tabbed_pane_unittest.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/views/controls/tabbed_pane/tabbed_pane_unittest.cc b/views/controls/tabbed_pane/tabbed_pane_unittest.cc index 12f82a5..958ac6b 100644 --- a/views/controls/tabbed_pane/tabbed_pane_unittest.cc +++ b/views/controls/tabbed_pane/tabbed_pane_unittest.cc @@ -38,20 +38,26 @@ class TabbedPaneTest : public testing::Test, } private: - virtual void SetUp() { + virtual void SetUp() OVERRIDE { tabbed_pane_ = new TabbedPane(); window_ = Widget::CreateWindowWithBounds(this, gfx::Rect(0, 0, 100, 100)); window_->Show(); } - virtual void TearDown() { + virtual void TearDown() OVERRIDE { window_->Close(); message_loop_.RunAllPending(); } - virtual views::View* GetContentsView() { + virtual views::View* GetContentsView() OVERRIDE { return tabbed_pane_; } + virtual views::Widget* GetWidget() OVERRIDE { + return tabbed_pane_->GetWidget(); + } + virtual const views::Widget* GetWidget() const OVERRIDE { + return tabbed_pane_->GetWidget(); + } MessageLoopForUI message_loop_; Widget* window_; |