summaryrefslogtreecommitdiffstats
path: root/content/content_shell.gypi
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-11 02:05:54 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-11 02:05:54 +0000
commitcf78600940d6128c18fe4498d4bbdce3ac137c1c (patch)
tree0b264b95352c086c200da74a15d98b38db8befd6 /content/content_shell.gypi
parent609d1c0748aa0809ad329fba259e073a696eada7 (diff)
downloadchromium_src-cf78600940d6128c18fe4498d4bbdce3ac137c1c.zip
chromium_src-cf78600940d6128c18fe4498d4bbdce3ac137c1c.tar.gz
chromium_src-cf78600940d6128c18fe4498d4bbdce3ac137c1c.tar.bz2
Move GamepadController from CppBoundClass to gin::Wrappable
Also, change the class to use chromium coding style. BUG=297480,331301 R=haraken@chromium.org Review URL: https://codereview.chromium.org/152543011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250279 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_shell.gypi')
-rw-r--r--content/content_shell.gypi4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 688e48a..eedf4ff 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -182,8 +182,6 @@
'shell/renderer/test_runner/CppVariant.h',
'shell/renderer/test_runner/EventSender.cpp',
'shell/renderer/test_runner/EventSender.h',
- 'shell/renderer/test_runner/GamepadController.cpp',
- 'shell/renderer/test_runner/GamepadController.h',
'shell/renderer/test_runner/KeyCodeMapping.cpp',
'shell/renderer/test_runner/KeyCodeMapping.h',
'shell/renderer/test_runner/MockColorChooser.cpp',
@@ -243,6 +241,8 @@
'shell/renderer/test_runner/WebTestThemeEngineMock.h',
'shell/renderer/test_runner/WebUserMediaClientMock.cpp',
'shell/renderer/test_runner/WebUserMediaClientMock.h',
+ 'shell/renderer/test_runner/gamepad_controller.cc',
+ 'shell/renderer/test_runner/gamepad_controller.h',
'shell/renderer/webkit_test_runner.cc',
'shell/renderer/webkit_test_runner.h',
'test/layouttest_support.cc',