Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Side by Side Diff: ui/views/corewm/desktop_capture_controller_unittest.cc

Issue 572593002: Revert of Clean up GestureEventDetails constructors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "ui/wm/core/capture_controller.h" 5 #include "ui/wm/core/capture_controller.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "ui/aura/env.h" 9 #include "ui/aura/env.h"
10 #include "ui/aura/test/test_window_delegate.h" 10 #include "ui/aura/test/test_window_delegate.h"
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 EXPECT_FALSE(widget1->GetNativeView()->HasCapture()); 160 EXPECT_FALSE(widget1->GetNativeView()->HasCapture());
161 EXPECT_FALSE(widget2->GetNativeView()->HasCapture()); 161 EXPECT_FALSE(widget2->GetNativeView()->HasCapture());
162 EXPECT_EQ(reinterpret_cast<aura::Window*>(0), 162 EXPECT_EQ(reinterpret_cast<aura::Window*>(0),
163 capture_client->GetCaptureWindow()); 163 capture_client->GetCaptureWindow());
164 164
165 widget1->GetNativeView()->SetCapture(); 165 widget1->GetNativeView()->SetCapture();
166 EXPECT_TRUE(widget1->GetNativeView()->HasCapture()); 166 EXPECT_TRUE(widget1->GetNativeView()->HasCapture());
167 EXPECT_FALSE(widget2->GetNativeView()->HasCapture()); 167 EXPECT_FALSE(widget2->GetNativeView()->HasCapture());
168 EXPECT_EQ(capture_client->GetCaptureWindow(), widget1->GetNativeView()); 168 EXPECT_EQ(capture_client->GetCaptureWindow(), widget1->GetNativeView());
169 169
170 ui::GestureEvent g1(80, 170 ui::GestureEvent g1(
171 80, 171 80,
172 0, 172 80,
173 base::TimeDelta(), 173 0,
174 ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS)); 174 base::TimeDelta(),
175 ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0.0f, 0.0f));
175 details = root1->OnEventFromSource(&g1); 176 details = root1->OnEventFromSource(&g1);
176 EXPECT_FALSE(details.dispatcher_destroyed); 177 EXPECT_FALSE(details.dispatcher_destroyed);
177 EXPECT_FALSE(details.target_destroyed); 178 EXPECT_FALSE(details.target_destroyed);
178 179
179 EXPECT_TRUE(v1->received_gesture_event()); 180 EXPECT_TRUE(v1->received_gesture_event());
180 EXPECT_FALSE(v2->received_gesture_event()); 181 EXPECT_FALSE(v2->received_gesture_event());
181 v1->Reset(); 182 v1->Reset();
182 v2->Reset(); 183 v2->Reset();
183 184
184 widget2->GetNativeView()->SetCapture(); 185 widget2->GetNativeView()->SetCapture();
185 186
186 EXPECT_FALSE(widget1->GetNativeView()->HasCapture()); 187 EXPECT_FALSE(widget1->GetNativeView()->HasCapture());
187 EXPECT_TRUE(widget2->GetNativeView()->HasCapture()); 188 EXPECT_TRUE(widget2->GetNativeView()->HasCapture());
188 EXPECT_EQ(capture_client->GetCaptureWindow(), widget2->GetNativeView()); 189 EXPECT_EQ(capture_client->GetCaptureWindow(), widget2->GetNativeView());
189 190
190 details = root2->OnEventFromSource(&g1); 191 details = root2->OnEventFromSource(&g1);
191 EXPECT_FALSE(details.dispatcher_destroyed); 192 EXPECT_FALSE(details.dispatcher_destroyed);
192 EXPECT_FALSE(details.target_destroyed); 193 EXPECT_FALSE(details.target_destroyed);
193 194
194 EXPECT_TRUE(v2->received_gesture_event()); 195 EXPECT_TRUE(v2->received_gesture_event());
195 EXPECT_FALSE(v1->received_gesture_event()); 196 EXPECT_FALSE(v1->received_gesture_event());
196 197
197 widget1->CloseNow(); 198 widget1->CloseNow();
198 widget2->CloseNow(); 199 widget2->CloseNow();
199 RunPendingMessages(); 200 RunPendingMessages();
200 } 201 }
201 202
202 } // namespace views 203 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/textfield/textfield_unittest.cc ('k') | ui/views/touchui/touch_selection_controller_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698