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

Side by Side Diff: content/browser/web_contents/web_contents_view_aura_browsertest.cc

Issue 1549113002: Switch to standard integer types in content/browser/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 12 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) 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 "content/browser/web_contents/web_contents_view_aura.h" 5 #include "content/browser/web_contents/web_contents_view_aura.h"
6 6
7 #include <stddef.h>
8
7 #include "base/command_line.h" 9 #include "base/command_line.h"
8 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/macros.h"
9 #include "base/run_loop.h" 12 #include "base/run_loop.h"
10 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
11 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
12 #include "base/test/test_timeouts.h" 15 #include "base/test/test_timeouts.h"
13 #include "base/thread_task_runner_handle.h" 16 #include "base/thread_task_runner_handle.h"
14 #include "base/values.h" 17 #include "base/values.h"
15 #if defined(OS_WIN) 18 #include "build/build_config.h"
16 #include "base/win/windows_version.h"
17 #endif
18 #include "content/browser/frame_host/navigation_controller_impl.h" 19 #include "content/browser/frame_host/navigation_controller_impl.h"
19 #include "content/browser/frame_host/navigation_entry_impl.h" 20 #include "content/browser/frame_host/navigation_entry_impl.h"
20 #include "content/browser/frame_host/navigation_entry_screenshot_manager.h" 21 #include "content/browser/frame_host/navigation_entry_screenshot_manager.h"
21 #include "content/browser/renderer_host/render_widget_host_view_aura.h" 22 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
22 #include "content/browser/web_contents/web_contents_impl.h" 23 #include "content/browser/web_contents/web_contents_impl.h"
23 #include "content/browser/web_contents/web_contents_view.h" 24 #include "content/browser/web_contents/web_contents_view.h"
24 #include "content/common/input/synthetic_web_input_event_builders.h" 25 #include "content/common/input/synthetic_web_input_event_builders.h"
25 #include "content/common/input_messages.h" 26 #include "content/common/input_messages.h"
26 #include "content/common/view_messages.h" 27 #include "content/common/view_messages.h"
27 #include "content/public/browser/browser_message_filter.h" 28 #include "content/public/browser/browser_message_filter.h"
(...skipping 10 matching lines...) Expand all
38 #include "content/shell/browser/shell.h" 39 #include "content/shell/browser/shell.h"
39 #include "net/test/embedded_test_server/embedded_test_server.h" 40 #include "net/test/embedded_test_server/embedded_test_server.h"
40 #include "ui/aura/window.h" 41 #include "ui/aura/window.h"
41 #include "ui/aura/window_tree_host.h" 42 #include "ui/aura/window_tree_host.h"
42 #include "ui/compositor/scoped_animation_duration_scale_mode.h" 43 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
43 #include "ui/events/event_processor.h" 44 #include "ui/events/event_processor.h"
44 #include "ui/events/event_switches.h" 45 #include "ui/events/event_switches.h"
45 #include "ui/events/event_utils.h" 46 #include "ui/events/event_utils.h"
46 #include "ui/events/test/event_generator.h" 47 #include "ui/events/test/event_generator.h"
47 48
49 #if defined(OS_WIN)
50 #include "base/win/windows_version.h"
51 #endif
52
48 namespace { 53 namespace {
49 54
50 // TODO(tdresser): Find a way to avoid sleeping like this. See crbug.com/405282 55 // TODO(tdresser): Find a way to avoid sleeping like this. See crbug.com/405282
51 // for details. 56 // for details.
52 void GiveItSomeTime() { 57 void GiveItSomeTime() {
53 base::RunLoop run_loop; 58 base::RunLoop run_loop;
54 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( 59 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
55 FROM_HERE, run_loop.QuitClosure(), 60 FROM_HERE, run_loop.QuitClosure(),
56 base::TimeDelta::FromMillisecondsD(10)); 61 base::TimeDelta::FromMillisecondsD(10));
57 run_loop.Run(); 62 run_loop.Run();
(...skipping 1063 matching lines...) Expand 10 before | Expand all | Expand 10 after
1121 details = dispatcher->OnEventFromSource(&release); 1126 details = dispatcher->OnEventFromSource(&release);
1122 ASSERT_FALSE(details.dispatcher_destroyed); 1127 ASSERT_FALSE(details.dispatcher_destroyed);
1123 WaitAFrame(); 1128 WaitAFrame();
1124 1129
1125 EXPECT_LT(0, tracker.num_overscroll_updates()); 1130 EXPECT_LT(0, tracker.num_overscroll_updates());
1126 EXPECT_FALSE(tracker.overscroll_completed()); 1131 EXPECT_FALSE(tracker.overscroll_completed());
1127 } 1132 }
1128 } 1133 }
1129 1134
1130 } // namespace content 1135 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.cc ('k') | content/browser/web_contents/web_contents_view_guest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698