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

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

Issue 696713002: Pointer/hover media query support: platform-dependent changes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Incremental, android-only changes Created 6 years, 1 month 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 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 prefs.use_solid_color_scrollbars = ui::IsOverlayScrollbarEnabled(); 399 prefs.use_solid_color_scrollbars = ui::IsOverlayScrollbarEnabled();
400 400
401 #if defined(OS_ANDROID) 401 #if defined(OS_ANDROID)
402 prefs.user_gesture_required_for_media_playback = !command_line.HasSwitch( 402 prefs.user_gesture_required_for_media_playback = !command_line.HasSwitch(
403 switches::kDisableGestureRequirementForMediaPlayback); 403 switches::kDisableGestureRequirementForMediaPlayback);
404 #endif 404 #endif
405 405
406 prefs.touch_enabled = ui::AreTouchEventsEnabled(); 406 prefs.touch_enabled = ui::AreTouchEventsEnabled();
407 prefs.device_supports_touch = prefs.touch_enabled && 407 prefs.device_supports_touch = prefs.touch_enabled &&
408 ui::IsTouchDevicePresent(); 408 ui::IsTouchDevicePresent();
409 prefs.available_pointer_types = ui::AvailablePointerTypes();
410 prefs.primary_pointer_type =
411 static_cast<content::PointerType>(ui::PrimaryPointerType());
412 prefs.available_hover_types = ui::AvailableHoverTypes();
413 prefs.primary_hover_type =
414 static_cast<content::HoverType>(ui::PrimaryHoverType());
415
409 #if defined(OS_ANDROID) 416 #if defined(OS_ANDROID)
410 prefs.device_supports_mouse = false; 417 prefs.device_supports_mouse = false;
411 #endif 418 #endif
412 419
413 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints(); 420 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints();
414 421
415 prefs.touch_adjustment_enabled = 422 prefs.touch_adjustment_enabled =
416 !command_line.HasSwitch(switches::kDisableTouchAdjustment); 423 !command_line.HasSwitch(switches::kDisableTouchAdjustment);
417 424
418 prefs.slimming_paint_enabled = 425 prefs.slimming_paint_enabled =
(...skipping 1007 matching lines...) Expand 10 before | Expand all | Expand 10 after
1426 FrameTree* frame_tree = delegate_->GetFrameTree(); 1433 FrameTree* frame_tree = delegate_->GetFrameTree();
1427 1434
1428 frame_tree->ResetForMainFrameSwap(); 1435 frame_tree->ResetForMainFrameSwap();
1429 } 1436 }
1430 1437
1431 void RenderViewHostImpl::SelectWordAroundCaret() { 1438 void RenderViewHostImpl::SelectWordAroundCaret() {
1432 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); 1439 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID()));
1433 } 1440 }
1434 1441
1435 } // namespace content 1442 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698