OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <algorithm> | 5 #include <algorithm> |
6 #include <set> | 6 #include <set> |
7 | 7 |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 2331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2342 } | 2342 } |
2343 | 2343 |
2344 #if !defined(OS_CHROMEOS) | 2344 #if !defined(OS_CHROMEOS) |
2345 TEST_F(WidgetTest, InactiveWidgetDoesNotGrabActivation) { | 2345 TEST_F(WidgetTest, InactiveWidgetDoesNotGrabActivation) { |
2346 Widget* widget = CreateTopLevelPlatformWidget(); | 2346 Widget* widget = CreateTopLevelPlatformWidget(); |
2347 widget->Show(); | 2347 widget->Show(); |
2348 EXPECT_EQ(GetWidgetShowState(widget), ui::SHOW_STATE_NORMAL); | 2348 EXPECT_EQ(GetWidgetShowState(widget), ui::SHOW_STATE_NORMAL); |
2349 | 2349 |
2350 Widget widget2; | 2350 Widget widget2; |
2351 Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP); | 2351 Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP); |
2352 params.can_activate = false; | |
2353 params.native_widget = new DesktopNativeWidgetAura(&widget2); | 2352 params.native_widget = new DesktopNativeWidgetAura(&widget2); |
2354 params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; | 2353 params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |
2355 widget2.Init(params); | 2354 widget2.Init(params); |
2356 widget2.Show(); | 2355 widget2.Show(); |
2357 | 2356 |
2358 EXPECT_EQ(GetWidgetShowState(&widget2), ui::SHOW_STATE_INACTIVE); | 2357 EXPECT_EQ(GetWidgetShowState(&widget2), ui::SHOW_STATE_INACTIVE); |
2359 EXPECT_EQ(GetWidgetShowState(widget), ui::SHOW_STATE_NORMAL); | 2358 EXPECT_EQ(GetWidgetShowState(widget), ui::SHOW_STATE_NORMAL); |
2360 | 2359 |
2361 widget->CloseNow(); | 2360 widget->CloseNow(); |
2362 widget2.CloseNow(); | 2361 widget2.CloseNow(); |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2464 child_widget.Init(child_params); | 2463 child_widget.Init(child_params); |
2465 child_widget.AddObserver(&observer); | 2464 child_widget.AddObserver(&observer); |
2466 child_widget.Show(); | 2465 child_widget.Show(); |
2467 | 2466 |
2468 parent_widget.CloseNow(); | 2467 parent_widget.CloseNow(); |
2469 } | 2468 } |
2470 #endif | 2469 #endif |
2471 | 2470 |
2472 } // namespace test | 2471 } // namespace test |
2473 } // namespace views | 2472 } // namespace views |
OLD | NEW |