diff options
| author | aruslan@chromium.org <aruslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 05:21:41 +0000 |
|---|---|---|
| committer | aruslan@chromium.org <aruslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 05:21:41 +0000 |
| commit | bc01ab8cee3cb615e8f028f6f596ab65c25b8cce (patch) | |
| tree | 664423b6ac3950223ee55292f6b63ae8c3796ca8 /webkit/support | |
| parent | 299c0ac7aa93b6562a1c6a8e3536185b96a30f95 (diff) | |
| download | chromium_src-bc01ab8cee3cb615e8f028f6f596ab65c25b8cce.zip chromium_src-bc01ab8cee3cb615e8f028f6f596ab65c25b8cce.tar.gz chromium_src-bc01ab8cee3cb615e8f028f6f596ab65c25b8cce.tar.bz2 | |
Fix CHECK(g_DeviceDisplayInfo_clazz) in WebKit tests.
Review URL: https://chromiumcodereview.appspot.com/12213052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181214 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
| -rw-r--r-- | webkit/support/platform_support_android.cc | 2 | ||||
| -rw-r--r-- | webkit/support/webkit_support.gypi | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/webkit/support/platform_support_android.cc b/webkit/support/platform_support_android.cc index 30effc7..67a43b4 100644 --- a/webkit/support/platform_support_android.cc +++ b/webkit/support/platform_support_android.cc @@ -17,6 +17,7 @@ #include "net/android/network_library.h" #include "net/android/net_jni_registrar.h" #include "media/base/android/media_jni_registrar.h" +#include "ui/android/ui_jni_registrar.h" #include "ui/base/resource/resource_bundle.h" #include "webkit/support/test_webkit_platform_support.h" #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" @@ -53,6 +54,7 @@ void BeforeInitialize(bool unit_test_mode) { if (!unit_test_mode) { media::RegisterJni(env); net::android::RegisterJni(env); + ui::android::RegisterJni(env); } } diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi index 68587b9..a7be051 100644 --- a/webkit/support/webkit_support.gypi +++ b/webkit/support/webkit_support.gypi @@ -21,6 +21,7 @@ '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/hyphen/hyphen.gyp:hyphen', '<(DEPTH)/ui/gl/gl.gyp:gl', + '<(DEPTH)/ui/ui.gyp:shell_dialogs', '<(DEPTH)/ui/ui.gyp:ui', 'glue', 'user_agent', |