Index: ui/views/widget/widget_unittest.cc |
=================================================================== |
--- ui/views/widget/widget_unittest.cc (revision 170484) |
+++ ui/views/widget/widget_unittest.cc (working copy) |
@@ -725,8 +725,7 @@ |
widget_closed_(NULL), |
widget_activated_(NULL), |
widget_shown_(NULL), |
- widget_hidden_(NULL), |
- widget_bounds_changed_(NULL) { |
+ widget_hidden_(NULL) { |
} |
virtual ~WidgetObserverTest() {} |
@@ -760,11 +759,6 @@ |
widget_hidden_ = widget; |
} |
- virtual void OnWidgetBoundsChanged(Widget* widget, |
- const gfx::Rect& new_bounds) OVERRIDE { |
- widget_bounds_changed_ = widget; |
- } |
- |
void reset() { |
active_ = NULL; |
widget_closed_ = NULL; |
@@ -772,7 +766,6 @@ |
widget_deactivated_ = NULL; |
widget_shown_ = NULL; |
widget_hidden_ = NULL; |
- widget_bounds_changed_ = NULL; |
} |
Widget* NewWidget() { |
@@ -787,7 +780,6 @@ |
const Widget* widget_deactivated() const { return widget_deactivated_; } |
const Widget* widget_shown() const { return widget_shown_; } |
const Widget* widget_hidden() const { return widget_hidden_; } |
- const Widget* widget_bounds_changed() const { return widget_bounds_changed_; } |
private: |
@@ -798,7 +790,6 @@ |
Widget* widget_deactivated_; |
Widget* widget_shown_; |
Widget* widget_hidden_; |
- Widget* widget_bounds_changed_; |
}; |
TEST_F(WidgetObserverTest, DISABLED_ActivationChange) { |
@@ -869,23 +860,6 @@ |
anchor->CloseNow(); |
} |
-TEST_F(WidgetObserverTest, WidgetBoundsChanged) { |
- Widget* child1 = NewWidget(); |
- Widget* child2 = NewWidget(); |
- |
- child1->OnNativeWidgetMove(); |
- EXPECT_EQ(child1, widget_bounds_changed()); |
- |
- child2->OnNativeWidgetMove(); |
- EXPECT_EQ(child2, widget_bounds_changed()); |
- |
- child1->OnNativeWidgetSizeChanged(gfx::Size()); |
- EXPECT_EQ(child1, widget_bounds_changed()); |
- |
- child2->OnNativeWidgetSizeChanged(gfx::Size()); |
- EXPECT_EQ(child2, widget_bounds_changed()); |
-} |
- |
#if !defined(USE_AURA) && defined(OS_WIN) |
// Aura needs shell to maximize/fullscreen window. |
// NativeWidgetGtk doesn't implement GetRestoredBounds. |