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

Unified Diff: content/shell/renderer/test_runner/event_sender.cc

Issue 234533002: Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, skip changing browser_main_loop.cc because of presubmit issues, will follow up Created 6 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: content/shell/renderer/test_runner/event_sender.cc
diff --git a/content/shell/renderer/test_runner/event_sender.cc b/content/shell/renderer/test_runner/event_sender.cc
index 3734672297afb91db3d5cacaf5ea08c36be18c50..53e2f11229d7bd9c41b4f35a8337fdc0a5bc5ba9 100644
--- a/content/shell/renderer/test_runner/event_sender.cc
+++ b/content/shell/renderer/test_runner/event_sender.cc
@@ -29,8 +29,6 @@
#include "third_party/WebKit/public/web/mac/WebInputEventFactory.h"
#elif defined(OS_ANDROID)
#include "third_party/WebKit/public/web/android/WebInputEventFactory.h"
-#elif defined(TOOLKIT_GTK)
-#include "third_party/WebKit/public/web/gtk/WebInputEventFactory.h"
#endif
using blink::WebContextMenuData;
@@ -50,8 +48,7 @@ using blink::WebTouchPoint;
using blink::WebVector;
using blink::WebView;
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID) || \
- defined(TOOLKIT_GTK)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID)
using blink::WebInputEventFactory;
#endif
@@ -1243,10 +1240,6 @@ void EventSender::KeyDown(const std::string& code_str,
event_down.modifiers = modifiers;
event_down.windowsKeyCode = code;
-#if defined(OS_LINUX) && defined(TOOLKIT_GTK)
- event_down.nativeKeyCode = NativeKeyCodeForWindowsKeyCode(code);
-#endif
-
if (generate_char) {
event_down.text[0] = text;
event_down.unmodifiedText[0] = text;
@@ -1254,8 +1247,7 @@ void EventSender::KeyDown(const std::string& code_str,
event_down.setKeyIdentifierFromWindowsKeyCode();
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID) || \
- defined(TOOLKIT_GTK)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID)
if (event_down.modifiers != 0)
event_down.isSystemKey = WebInputEventFactory::isSystemKeyEvent(event_down);
#endif
« no previous file with comments | « content/shell/browser/webkit_test_controller.cc ('k') | content/shell/renderer/test_runner/key_code_mapping.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698