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

Side by Side Diff: content/child/blink_platform_impl.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/child/blink_platform_impl.h" 5 #include "content/child/blink_platform_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #include "third_party/WebKit/public/platform/WebConvertableToTraceFormat.h" 58 #include "third_party/WebKit/public/platform/WebConvertableToTraceFormat.h"
59 #include "third_party/WebKit/public/platform/WebData.h" 59 #include "third_party/WebKit/public/platform/WebData.h"
60 #include "third_party/WebKit/public/platform/WebFloatPoint.h" 60 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
61 #include "third_party/WebKit/public/platform/WebMemoryDumpProvider.h" 61 #include "third_party/WebKit/public/platform/WebMemoryDumpProvider.h"
62 #include "third_party/WebKit/public/platform/WebString.h" 62 #include "third_party/WebKit/public/platform/WebString.h"
63 #include "third_party/WebKit/public/platform/WebURL.h" 63 #include "third_party/WebKit/public/platform/WebURL.h"
64 #include "third_party/WebKit/public/platform/WebWaitableEvent.h" 64 #include "third_party/WebKit/public/platform/WebWaitableEvent.h"
65 #include "third_party/WebKit/public/web/WebSecurityOrigin.h" 65 #include "third_party/WebKit/public/web/WebSecurityOrigin.h"
66 #include "ui/base/layout.h" 66 #include "ui/base/layout.h"
67 #include "ui/events/gestures/blink/web_gesture_curve_impl.h" 67 #include "ui/events/gestures/blink/web_gesture_curve_impl.h"
68 #include "ui/events/keycodes/dom4/keycode_converter.h" 68 #include "ui/events/keycodes/dom/keycode_converter.h"
69 69
70 using blink::WebData; 70 using blink::WebData;
71 using blink::WebFallbackThemeEngine; 71 using blink::WebFallbackThemeEngine;
72 using blink::WebLocalizedString; 72 using blink::WebLocalizedString;
73 using blink::WebString; 73 using blink::WebString;
74 using blink::WebThemeEngine; 74 using blink::WebThemeEngine;
75 using blink::WebURL; 75 using blink::WebURL;
76 using blink::WebURLError; 76 using blink::WebURLError;
77 using blink::WebURLLoader; 77 using blink::WebURLLoader;
78 78
(...skipping 1287 matching lines...) Expand 10 before | Expand all | Expand 10 after
1366 return WebString::fromUTF8(ui::KeycodeConverter::DomCodeToCodeString( 1366 return WebString::fromUTF8(ui::KeycodeConverter::DomCodeToCodeString(
1367 static_cast<ui::DomCode>(dom_code))); 1367 static_cast<ui::DomCode>(dom_code)));
1368 } 1368 }
1369 1369
1370 int BlinkPlatformImpl::domEnumFromCodeString(const WebString& code) { 1370 int BlinkPlatformImpl::domEnumFromCodeString(const WebString& code) {
1371 return static_cast<int>(ui::KeycodeConverter::CodeStringToDomCode( 1371 return static_cast<int>(ui::KeycodeConverter::CodeStringToDomCode(
1372 code.utf8().data())); 1372 code.utf8().data()));
1373 } 1373 }
1374 1374
1375 } // namespace content 1375 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/web_input_event_aura_unittest.cc ('k') | content/content_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698