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 "content/renderer/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <map> | 9 #include <map> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/allocator/allocator_extension.h" | 12 #include "base/allocator/allocator_extension.h" |
13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
14 #include "base/debug/trace_event.h" | 14 #include "base/debug/trace_event.h" |
| 15 #include "base/files/file_util_proxy.h" |
15 #include "base/lazy_instance.h" | 16 #include "base/lazy_instance.h" |
16 #include "base/logging.h" | 17 #include "base/logging.h" |
17 #include "base/memory/discardable_memory.h" | 18 #include "base/memory/discardable_memory.h" |
18 #include "base/memory/shared_memory.h" | 19 #include "base/memory/shared_memory.h" |
19 #include "base/metrics/field_trial.h" | 20 #include "base/metrics/field_trial.h" |
20 #include "base/metrics/histogram.h" | 21 #include "base/metrics/histogram.h" |
21 #include "base/metrics/stats_table.h" | 22 #include "base/metrics/stats_table.h" |
22 #include "base/path_service.h" | 23 #include "base/path_service.h" |
23 #include "base/strings/string16.h" | 24 #include "base/strings/string16.h" |
24 #include "base/strings/string_tokenizer.h" | 25 #include "base/strings/string_tokenizer.h" |
(...skipping 1268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1293 media_thread_->Start(); | 1294 media_thread_->Start(); |
1294 } | 1295 } |
1295 return media_thread_->message_loop_proxy(); | 1296 return media_thread_->message_loop_proxy(); |
1296 } | 1297 } |
1297 | 1298 |
1298 void RenderThreadImpl::SetFlingCurveParameters( | 1299 void RenderThreadImpl::SetFlingCurveParameters( |
1299 const std::vector<float>& new_touchpad, | 1300 const std::vector<float>& new_touchpad, |
1300 const std::vector<float>& new_touchscreen) { | 1301 const std::vector<float>& new_touchscreen) { |
1301 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1302 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
1302 new_touchscreen); | 1303 new_touchscreen); |
1303 | |
1304 } | 1304 } |
1305 | 1305 |
1306 } // namespace content | 1306 } // namespace content |
OLD | NEW |