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

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 2467913002: Touch event flag should control only DOM event firing. (Closed)
Patch Set: Deprecate the histogram. Created 4 years 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/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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 #include "content/public/common/file_chooser_file_info.h" 78 #include "content/public/common/file_chooser_file_info.h"
79 #include "content/public/common/file_chooser_params.h" 79 #include "content/public/common/file_chooser_params.h"
80 #include "content/public/common/result_codes.h" 80 #include "content/public/common/result_codes.h"
81 #include "content/public/common/url_constants.h" 81 #include "content/public/common/url_constants.h"
82 #include "content/public/common/url_utils.h" 82 #include "content/public/common/url_utils.h"
83 #include "net/base/url_util.h" 83 #include "net/base/url_util.h"
84 #include "net/url_request/url_request_context_getter.h" 84 #include "net/url_request/url_request_context_getter.h"
85 #include "third_party/skia/include/core/SkBitmap.h" 85 #include "third_party/skia/include/core/SkBitmap.h"
86 #include "ui/base/clipboard/clipboard.h" 86 #include "ui/base/clipboard/clipboard.h"
87 #include "ui/base/touch/touch_device.h" 87 #include "ui/base/touch/touch_device.h"
88 #include "ui/base/touch/touch_enabled.h"
89 #include "ui/base/ui_base_switches.h" 88 #include "ui/base/ui_base_switches.h"
89 #include "ui/events/event_switches.h"
90 #include "ui/gfx/animation/animation.h" 90 #include "ui/gfx/animation/animation.h"
91 #include "ui/gfx/color_space.h" 91 #include "ui/gfx/color_space.h"
92 #include "ui/gfx/image/image_skia.h" 92 #include "ui/gfx/image/image_skia.h"
93 #include "ui/gfx/native_widget_types.h" 93 #include "ui/gfx/native_widget_types.h"
94 #include "ui/native_theme/native_theme_switches.h" 94 #include "ui/native_theme/native_theme_switches.h"
95 #include "url/url_constants.h" 95 #include "url/url_constants.h"
96 96
97 #if defined(OS_WIN) 97 #if defined(OS_WIN)
98 #include "ui/display/win/screen_win.h" 98 #include "ui/display/win/screen_win.h"
99 #include "ui/gfx/geometry/dip_util.h" 99 #include "ui/gfx/geometry/dip_util.h"
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 prefs.progress_bar_completion = GetProgressBarCompletionPolicy(); 442 prefs.progress_bar_completion = GetProgressBarCompletionPolicy();
443 443
444 prefs.use_solid_color_scrollbars = true; 444 prefs.use_solid_color_scrollbars = true;
445 #endif 445 #endif
446 446
447 // Handle autoplay gesture override experiment. 447 // Handle autoplay gesture override experiment.
448 // Note that anything but a well-formed string turns the experiment off. 448 // Note that anything but a well-formed string turns the experiment off.
449 prefs.autoplay_experiment_mode = base::FieldTrialList::FindFullName( 449 prefs.autoplay_experiment_mode = base::FieldTrialList::FindFullName(
450 "MediaElementGestureOverrideExperiment"); 450 "MediaElementGestureOverrideExperiment");
451 451
452 prefs.touch_enabled = ui::AreTouchEventsEnabled(); 452 prefs.touch_event_api_enabled =
453 prefs.device_supports_touch = prefs.touch_enabled && 453 !command_line.HasSwitch(switches::kTouchEvents) ||
454 ui::GetTouchScreensAvailability() == 454 command_line.GetSwitchValueASCII(switches::kTouchEvents) !=
455 ui::TouchScreensAvailability::ENABLED; 455 switches::kTouchEventsDisabled;
456 prefs.device_supports_touch = ui::GetTouchScreensAvailability() ==
457 ui::TouchScreensAvailability::ENABLED;
456 std::tie(prefs.available_pointer_types, prefs.available_hover_types) = 458 std::tie(prefs.available_pointer_types, prefs.available_hover_types) =
457 ui::GetAvailablePointerAndHoverTypes(); 459 ui::GetAvailablePointerAndHoverTypes();
458 prefs.primary_pointer_type = 460 prefs.primary_pointer_type =
459 ui::GetPrimaryPointerType(prefs.available_pointer_types); 461 ui::GetPrimaryPointerType(prefs.available_pointer_types);
460 prefs.primary_hover_type = 462 prefs.primary_hover_type =
461 ui::GetPrimaryHoverType(prefs.available_hover_types); 463 ui::GetPrimaryHoverType(prefs.available_hover_types);
462 464
463 #if defined(OS_ANDROID) 465 #if defined(OS_ANDROID)
464 prefs.device_supports_mouse = false; 466 prefs.device_supports_mouse = false;
465 #endif 467 #endif
(...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after
1073 } else { 1075 } else {
1074 render_view_ready_on_process_launch_ = true; 1076 render_view_ready_on_process_launch_ = true;
1075 } 1077 }
1076 } 1078 }
1077 1079
1078 void RenderViewHostImpl::RenderViewReady() { 1080 void RenderViewHostImpl::RenderViewReady() {
1079 delegate_->RenderViewReady(this); 1081 delegate_->RenderViewReady(this);
1080 } 1082 }
1081 1083
1082 } // namespace content 1084 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698