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

Unified Diff: ui/test/test_suite.cc

Issue 11886074: Use correct favicon scale factor on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Renamed and added JavaBitmap JNI registration to .h Created 7 years, 11 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: ui/test/test_suite.cc
diff --git a/ui/test/test_suite.cc b/ui/test/test_suite.cc
index 832a1eae94f4c9731a90ca4b72891dd81844a4ba..4d372141ff8814fa5e320a922a93be1d9da517c4 100644
--- a/ui/test/test_suite.cc
+++ b/ui/test/test_suite.cc
@@ -12,6 +12,11 @@
#include "ui/base/ui_base_paths.h"
#include "ui/gfx/gfx_paths.h"
+#if defined(OS_ANDROID)
+#include "base/android/jni_android.h"
+#include "ui/android/ui_jni_registrar.h"
+#endif
+
#if defined(OS_MACOSX) && !defined(OS_IOS)
#include "base/mac/bundle_locations.h"
#endif
@@ -24,6 +29,11 @@ UITestSuite::UITestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {}
void UITestSuite::Initialize() {
base::TestSuite::Initialize();
+#if defined(OS_ANDROID)
+ // Register JNI bindings for android.
+ ui::android::RegisterJni(base::android::AttachCurrentThread());
+#endif
+
ui::RegisterPathProvider();
gfx::RegisterPathProvider();
« ui/gfx/android/device_info.h ('K') | « ui/gfx/screen_android.cc ('k') | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698