Chromium Code Reviews| 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/browser/renderer_host/render_view_host_impl.h" | 5 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 488 prefs.progress_bar_completion = GetProgressBarCompletionPolicy(); | 488 prefs.progress_bar_completion = GetProgressBarCompletionPolicy(); |
| 489 | 489 |
| 490 prefs.use_solid_color_scrollbars = true; | 490 prefs.use_solid_color_scrollbars = true; |
| 491 #endif | 491 #endif |
| 492 | 492 |
| 493 // Handle autoplay gesture override experiment. | 493 // Handle autoplay gesture override experiment. |
| 494 // Note that anything but a well-formed string turns the experiment off. | 494 // Note that anything but a well-formed string turns the experiment off. |
| 495 prefs.autoplay_experiment_mode = base::FieldTrialList::FindFullName( | 495 prefs.autoplay_experiment_mode = base::FieldTrialList::FindFullName( |
| 496 "MediaElementGestureOverrideExperiment"); | 496 "MediaElementGestureOverrideExperiment"); |
| 497 | 497 |
| 498 prefs.touch_enabled = ui::AreTouchEventsEnabled(); | 498 prefs.touch_api_enabled = ui::IsTouchAPIEnabled(); |
| 499 prefs.device_supports_touch = prefs.touch_enabled && | 499 prefs.device_supports_touch = prefs.touch_api_enabled && |
|
mustaq
2016/11/03 18:10:49
I think the removing touch_api_enabled condition h
| |
| 500 ui::GetTouchScreensAvailability() == | 500 ui::GetTouchScreensAvailability() == |
| 501 ui::TouchScreensAvailability::ENABLED; | 501 ui::TouchScreensAvailability::ENABLED; |
| 502 std::tie(prefs.available_pointer_types, prefs.available_hover_types) = | 502 std::tie(prefs.available_pointer_types, prefs.available_hover_types) = |
| 503 ui::GetAvailablePointerAndHoverTypes(); | 503 ui::GetAvailablePointerAndHoverTypes(); |
| 504 prefs.primary_pointer_type = | 504 prefs.primary_pointer_type = |
| 505 ui::GetPrimaryPointerType(prefs.available_pointer_types); | 505 ui::GetPrimaryPointerType(prefs.available_pointer_types); |
| 506 prefs.primary_hover_type = | 506 prefs.primary_hover_type = |
| 507 ui::GetPrimaryHoverType(prefs.available_hover_types); | 507 ui::GetPrimaryHoverType(prefs.available_hover_types); |
| 508 | 508 |
| 509 #if defined(OS_ANDROID) | 509 #if defined(OS_ANDROID) |
| (...skipping 812 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1322 // Note: We are using the origin URL provided by the sender here. It may be | 1322 // Note: We are using the origin URL provided by the sender here. It may be |
| 1323 // different from the receiver's. | 1323 // different from the receiver's. |
| 1324 file_system_file.url = | 1324 file_system_file.url = |
| 1325 GURL(storage::GetIsolatedFileSystemRootURIString( | 1325 GURL(storage::GetIsolatedFileSystemRootURIString( |
| 1326 file_system_url.origin(), filesystem_id, std::string()) | 1326 file_system_url.origin(), filesystem_id, std::string()) |
| 1327 .append(register_name)); | 1327 .append(register_name)); |
| 1328 } | 1328 } |
| 1329 } | 1329 } |
| 1330 | 1330 |
| 1331 } // namespace content | 1331 } // namespace content |
| OLD | NEW |