| Index: views/controls/tabbed_pane/tabbed_pane_unittest.cc
|
| ===================================================================
|
| --- views/controls/tabbed_pane/tabbed_pane_unittest.cc (revision 89357)
|
| +++ views/controls/tabbed_pane/tabbed_pane_unittest.cc (working copy)
|
| @@ -38,20 +38,26 @@
|
| }
|
|
|
| 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_;
|
|
|