| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "base/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/bind.h" | 6 #include "base/bind.h" |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
| 10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
| (...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 750 init_params.activatable = Widget::InitParams::ACTIVATABLE_NO; | 750 init_params.activatable = Widget::InitParams::ACTIVATABLE_NO; |
| 751 #if !defined(OS_CHROMEOS) | 751 #if !defined(OS_CHROMEOS) |
| 752 init_params.native_widget = new PlatformDesktopNativeWidget(&widget); | 752 init_params.native_widget = new PlatformDesktopNativeWidget(&widget); |
| 753 #endif // !defined(OS_CHROMEOS) | 753 #endif // !defined(OS_CHROMEOS) |
| 754 widget.Init(init_params); | 754 widget.Init(init_params); |
| 755 | 755 |
| 756 widget.Show(); | 756 widget.Show(); |
| 757 EXPECT_FALSE(widget.IsActive()); | 757 EXPECT_FALSE(widget.IsActive()); |
| 758 } | 758 } |
| 759 | 759 |
| 760 // No touch events for toolkit-views on Mac http://crbug.com/445520. |
| 761 #if defined(OS_MACOSX) |
| 762 #define MAYBE_TouchSelectionQuickMenuIsNotActivated \ |
| 763 DISABLED_TouchSelectionQuickMenuIsNotActivated |
| 764 #else |
| 765 #define MAYBE_TouchSelectionQuickMenuIsNotActivated \ |
| 766 TouchSelectionQuickMenuIsNotActivated |
| 767 #endif |
| 768 |
| 760 // Test that touch selection quick menu is not activated when opened. | 769 // Test that touch selection quick menu is not activated when opened. |
| 761 TEST_F(WidgetTestInteractive, TouchSelectionQuickMenuIsNotActivated) { | 770 TEST_F(WidgetTestInteractive, MAYBE_TouchSelectionQuickMenuIsNotActivated) { |
| 762 base::CommandLine::ForCurrentProcess()->AppendSwitch( | 771 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
| 763 switches::kEnableTouchEditing); | 772 switches::kEnableTouchEditing); |
| 764 #if defined(OS_WIN) | 773 #if defined(OS_WIN) |
| 765 views_delegate().set_use_desktop_native_widgets(true); | 774 views_delegate().set_use_desktop_native_widgets(true); |
| 766 #endif // !defined(OS_WIN) | 775 #endif // !defined(OS_WIN) |
| 767 | 776 |
| 768 Widget widget; | 777 Widget widget; |
| 769 Widget::InitParams init_params = | 778 Widget::InitParams init_params = |
| 770 CreateParams(Widget::InitParams::TYPE_WINDOW_FRAMELESS); | 779 CreateParams(Widget::InitParams::TYPE_WINDOW_FRAMELESS); |
| 771 init_params.bounds = gfx::Rect(0, 0, 200, 200); | 780 init_params.bounds = gfx::Rect(0, 0, 200, 200); |
| (...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1161 ui::EventDispatchDetails details = widget1.GetNativeWindow()-> | 1170 ui::EventDispatchDetails details = widget1.GetNativeWindow()-> |
| 1162 GetHost()->event_processor()->OnEventFromSource(&mouse_event); | 1171 GetHost()->event_processor()->OnEventFromSource(&mouse_event); |
| 1163 ASSERT_FALSE(details.dispatcher_destroyed); | 1172 ASSERT_FALSE(details.dispatcher_destroyed); |
| 1164 EXPECT_TRUE(widget1.GetAndClearGotMouseEvent()); | 1173 EXPECT_TRUE(widget1.GetAndClearGotMouseEvent()); |
| 1165 EXPECT_FALSE(widget2.GetAndClearGotMouseEvent()); | 1174 EXPECT_FALSE(widget2.GetAndClearGotMouseEvent()); |
| 1166 } | 1175 } |
| 1167 #endif // defined(OS_WIN) | 1176 #endif // defined(OS_WIN) |
| 1168 | 1177 |
| 1169 } // namespace test | 1178 } // namespace test |
| 1170 } // namespace views | 1179 } // namespace views |
| OLD | NEW |