| Index: views/focus/focus_manager_unittest.cc
|
| ===================================================================
|
| --- views/focus/focus_manager_unittest.cc (revision 89357)
|
| +++ views/focus/focus_manager_unittest.cc (working copy)
|
| @@ -116,13 +116,13 @@
|
| #endif
|
| }
|
|
|
| - virtual void SetUp() {
|
| + virtual void SetUp() OVERRIDE {
|
| window_ = Widget::CreateWindowWithBounds(this, bounds());
|
| InitContentView();
|
| window_->Show();
|
| }
|
|
|
| - virtual void TearDown() {
|
| + virtual void TearDown() OVERRIDE {
|
| if (focus_change_listener_)
|
| GetFocusManager()->RemoveFocusChangeListener(focus_change_listener_);
|
| window_->Close();
|
| @@ -152,11 +152,17 @@
|
| }
|
|
|
| // WidgetDelegate Implementation.
|
| - virtual View* GetContentsView() {
|
| + virtual View* GetContentsView() OVERRIDE {
|
| if (!content_view_)
|
| content_view_ = new View();
|
| return content_view_;
|
| }
|
| + virtual Widget* GetWidget() OVERRIDE {
|
| + return content_view_->GetWidget();
|
| + }
|
| + virtual const Widget* GetWidget() const OVERRIDE {
|
| + return content_view_->GetWidget();
|
| + }
|
|
|
| virtual void InitContentView() {
|
| }
|
|
|