| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "views/widget/native_widget_views.h" | 5 #include "views/widget/native_widget_views.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
| 11 #include "views/test/test_views_delegate.h" | 11 #include "views/test/test_views_delegate.h" |
| 12 #include "views/views_delegate.h" | 12 #include "views/views_delegate.h" |
| 13 | 13 |
| 14 #if defined(OS_WIN) | 14 #if defined(USE_AURA) |
| 15 #include "views/widget/native_widget_aura.h" |
| 16 #elif defined(OS_WIN) |
| 15 #include "views/widget/native_widget_win.h" | 17 #include "views/widget/native_widget_win.h" |
| 16 #elif defined(TOOLKIT_USES_GTK) | 18 #elif defined(TOOLKIT_USES_GTK) |
| 17 #include "views/widget/native_widget_gtk.h" | 19 #include "views/widget/native_widget_gtk.h" |
| 18 #endif | 20 #endif |
| 19 | 21 |
| 20 namespace views { | 22 namespace views { |
| 21 namespace { | 23 namespace { |
| 22 | 24 |
| 23 #if defined(TOOLKIT_USES_GTK) | 25 #if defined(TOOLKIT_USES_GTK) |
| 24 // A widget that assumes mouse capture always works. | 26 // A widget that assumes mouse capture always works. |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 WidgetTestViewsDelegate views_delegate; | 109 WidgetTestViewsDelegate views_delegate; |
| 108 | 110 |
| 109 private: | 111 private: |
| 110 MessageLoopForUI message_loop_; | 112 MessageLoopForUI message_loop_; |
| 111 | 113 |
| 112 DISALLOW_COPY_AND_ASSIGN(WidgetTest); | 114 DISALLOW_COPY_AND_ASSIGN(WidgetTest); |
| 113 }; | 115 }; |
| 114 | 116 |
| 115 NativeWidget* CreatePlatformNativeWidget( | 117 NativeWidget* CreatePlatformNativeWidget( |
| 116 internal::NativeWidgetDelegate* delegate) { | 118 internal::NativeWidgetDelegate* delegate) { |
| 117 #if defined(OS_WIN) | 119 #if defined(USE_AURA) |
| 120 return new NativeWidgetAura(delegate); |
| 121 #elif defined(OS_WIN) |
| 118 return new NativeWidgetWin(delegate); | 122 return new NativeWidgetWin(delegate); |
| 119 #elif defined(TOOLKIT_USES_GTK) | 123 #elif defined(TOOLKIT_USES_GTK) |
| 120 return new NativeWidgetGtkCapture(delegate); | 124 return new NativeWidgetGtkCapture(delegate); |
| 121 #endif | 125 #endif |
| 122 } | 126 } |
| 123 | 127 |
| 124 Widget* CreateTopLevelPlatformWidget() { | 128 Widget* CreateTopLevelPlatformWidget() { |
| 125 Widget* toplevel = new Widget; | 129 Widget* toplevel = new Widget; |
| 126 Widget::InitParams toplevel_params(Widget::InitParams::TYPE_WINDOW); | 130 Widget::InitParams toplevel_params(Widget::InitParams::TYPE_WINDOW); |
| 127 toplevel_params.native_widget = CreatePlatformNativeWidget(toplevel); | 131 toplevel_params.native_widget = CreatePlatformNativeWidget(toplevel); |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 304 struct OwnershipTestState { | 308 struct OwnershipTestState { |
| 305 OwnershipTestState() : widget_deleted(false), native_widget_deleted(false) {} | 309 OwnershipTestState() : widget_deleted(false), native_widget_deleted(false) {} |
| 306 | 310 |
| 307 bool widget_deleted; | 311 bool widget_deleted; |
| 308 bool native_widget_deleted; | 312 bool native_widget_deleted; |
| 309 }; | 313 }; |
| 310 | 314 |
| 311 // A platform NativeWidget subclass that updates a bag of state when it is | 315 // A platform NativeWidget subclass that updates a bag of state when it is |
| 312 // destroyed. | 316 // destroyed. |
| 313 class OwnershipTestNativeWidget : | 317 class OwnershipTestNativeWidget : |
| 314 #if defined(OS_WIN) | 318 #if defined(USE_AURA) |
| 319 public NativeWidgetAura, |
| 320 #elif defined(OS_WIN) |
| 315 public NativeWidgetWin { | 321 public NativeWidgetWin { |
| 316 #elif defined(TOOLKIT_USES_GTK) | 322 #elif defined(TOOLKIT_USES_GTK) |
| 317 public NativeWidgetGtk { | 323 public NativeWidgetGtk { |
| 318 #endif | 324 #endif |
| 319 public: | 325 public: |
| 320 OwnershipTestNativeWidget(internal::NativeWidgetDelegate* delegate, | 326 OwnershipTestNativeWidget(internal::NativeWidgetDelegate* delegate, |
| 321 OwnershipTestState* state) | 327 OwnershipTestState* state) |
| 322 #if defined(OS_WIN) | 328 #if defined(USE_AURA) |
| 329 : NativeWidgetAura(delegate), |
| 330 #elif defined(OS_WIN) |
| 323 : NativeWidgetWin(delegate), | 331 : NativeWidgetWin(delegate), |
| 324 #elif defined(TOOLKIT_USES_GTK) | 332 #elif defined(TOOLKIT_USES_GTK) |
| 325 : NativeWidgetGtk(delegate), | 333 : NativeWidgetGtk(delegate), |
| 326 #endif | 334 #endif |
| 327 state_(state) { | 335 state_(state) { |
| 328 } | 336 } |
| 329 virtual ~OwnershipTestNativeWidget() { | 337 virtual ~OwnershipTestNativeWidget() { |
| 330 state_->native_widget_deleted = true; | 338 state_->native_widget_deleted = true; |
| 331 } | 339 } |
| 332 | 340 |
| (...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 673 | 681 |
| 674 child1->Show(); | 682 child1->Show(); |
| 675 EXPECT_EQ(child1, widget_shown()); | 683 EXPECT_EQ(child1, widget_shown()); |
| 676 | 684 |
| 677 child2->Show(); | 685 child2->Show(); |
| 678 EXPECT_EQ(child2, widget_shown()); | 686 EXPECT_EQ(child2, widget_shown()); |
| 679 } | 687 } |
| 680 | 688 |
| 681 } // namespace | 689 } // namespace |
| 682 } // namespace views | 690 } // namespace views |
| OLD | NEW |