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

Side by Side Diff: content/browser/renderer_host/input/input_queue_unittest.cc

Issue 24257011: Revert "Revert 224496 "Move ui/base/latency_info* to ui/events"" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix gyp bustage Created 7 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 <vector> 5 #include <vector>
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "content/browser/renderer_host/input/browser_input_event.h" 8 #include "content/browser/renderer_host/input/browser_input_event.h"
9 #include "content/browser/renderer_host/input/input_queue.h" 9 #include "content/browser/renderer_host/input/input_queue.h"
10 #include "content/browser/renderer_host/input/input_queue_client.h" 10 #include "content/browser/renderer_host/input/input_queue_client.h"
11 #include "content/common/input/event_packet.h" 11 #include "content/common/input/event_packet.h"
12 #include "content/common/input/input_event.h" 12 #include "content/common/input/input_event.h"
13 #include "content/common/input/ipc_input_event_payload.h" 13 #include "content/common/input/ipc_input_event_payload.h"
14 #include "content/common/input/web_input_event_payload.h" 14 #include "content/common/input/web_input_event_payload.h"
15 #include "content/common/input_messages.h" 15 #include "content/common/input_messages.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 #include "ui/base/latency_info.h" 17 #include "ui/events/latency_info.h"
18 18
19 namespace content { 19 namespace content {
20 namespace { 20 namespace {
21 21
22 using WebKit::WebGestureEvent; 22 using WebKit::WebGestureEvent;
23 using WebKit::WebInputEvent; 23 using WebKit::WebInputEvent;
24 using WebKit::WebKeyboardEvent; 24 using WebKit::WebKeyboardEvent;
25 using WebKit::WebMouseEvent; 25 using WebKit::WebMouseEvent;
26 using WebKit::WebMouseWheelEvent; 26 using WebKit::WebMouseWheelEvent;
27 using WebKit::WebTouchEvent; 27 using WebKit::WebTouchEvent;
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 EXPECT_EQ(2u, acked_followup_dispositions_.size()); 354 EXPECT_EQ(2u, acked_followup_dispositions_.size());
355 EXPECT_EQ(1u, current_packet_dispositions_.size()); 355 EXPECT_EQ(1u, current_packet_dispositions_.size());
356 EXPECT_EQ(1, num_flush_completions()); 356 EXPECT_EQ(1, num_flush_completions());
357 357
358 ASSERT_TRUE(FinishFlush(INPUT_EVENT_MAIN_THREAD_CONSUMED)); 358 ASSERT_TRUE(FinishFlush(INPUT_EVENT_MAIN_THREAD_CONSUMED));
359 EXPECT_EQ(2, num_flush_completions()); 359 EXPECT_EQ(2, num_flush_completions());
360 } 360 }
361 361
362 } // namespace 362 } // namespace
363 } // namespace content 363 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/compositing_iosurface_mac.h ('k') | content/browser/renderer_host/render_widget_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698