diff options
| author | aruslan@chromium.org <aruslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-24 01:50:11 +0000 |
|---|---|---|
| committer | aruslan@chromium.org <aruslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-24 01:50:11 +0000 |
| commit | 276e8a328ac79317d8202b1ff31018c94af01c73 (patch) | |
| tree | bcd6a0553fccf51cbe2d770dcddc5dc9f7ce7c95 /ui/test/test_suite.cc | |
| parent | 0be98f3d8cbe8996b50ec3be7160d4de1f200f0b (diff) | |
| download | chromium_src-276e8a328ac79317d8202b1ff31018c94af01c73.zip chromium_src-276e8a328ac79317d8202b1ff31018c94af01c73.tar.gz chromium_src-276e8a328ac79317d8202b1ff31018c94af01c73.tar.bz2 | |
Use correct favicon scale factor on Android.
- Splits and moves Android's display DeviceInfo from content to gfx;
- Uses DeviceInfo for Android's Screen implementation;
- Uses PrimaryDisplay's scale to figure out favicon scale factor.
BUG=168319
BUG=117839
TEST=manual as in 168319; AwSettingsTest#testUseWideViewportLayoutWidth
Review URL: https://chromiumcodereview.appspot.com/11886074
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178472 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/test/test_suite.cc')
| -rw-r--r-- | ui/test/test_suite.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/ui/test/test_suite.cc b/ui/test/test_suite.cc index 832a1ea..4d37214 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(); |