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

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

Issue 1136503003: Consolidate ui/events/keycodes/dom[34]/ into .../dom/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 7 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/renderer_host/web_input_event_aura.h" 5 #include "content/browser/renderer_host/web_input_event_aura.h"
6 6
7 #include "content/browser/renderer_host/input/web_input_event_util.h" 7 #include "content/browser/renderer_host/input/web_input_event_util.h"
8 #include "content/browser/renderer_host/ui_events_helper.h" 8 #include "content/browser/renderer_host/ui_events_helper.h"
9 #include "ui/aura/client/screen_position_client.h" 9 #include "ui/aura/client/screen_position_client.h"
10 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
11 #include "ui/events/blink/blink_event_util.h" 11 #include "ui/events/blink/blink_event_util.h"
12 #include "ui/events/event.h" 12 #include "ui/events/event.h"
13 #include "ui/events/event_utils.h" 13 #include "ui/events/event_utils.h"
14 #include "ui/events/keycodes/dom4/keycode_converter.h" 14 #include "ui/events/keycodes/dom/keycode_converter.h"
15 15
16 namespace content { 16 namespace content {
17 17
18 namespace { 18 namespace {
19 19
20 gfx::Point GetScreenLocationFromEvent(const ui::LocatedEvent& event) { 20 gfx::Point GetScreenLocationFromEvent(const ui::LocatedEvent& event) {
21 if (!event.target()) 21 if (!event.target())
22 return event.root_location(); 22 return event.root_location();
23 23
24 aura::Window* root = 24 aura::Window* root =
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 webkit_event.deltaY = event.y_offset(); 392 webkit_event.deltaY = event.y_offset();
393 } 393 }
394 394
395 webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick; 395 webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick;
396 webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick; 396 webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick;
397 397
398 return webkit_event; 398 return webkit_event;
399 } 399 }
400 400
401 } // namespace content 401 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698