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 /content/app | |
| 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 'content/app')
| -rw-r--r-- | content/app/android/library_loader_hooks.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc index 80026b8..ac6ef27 100644 --- a/content/app/android/library_loader_hooks.cc +++ b/content/app/android/library_loader_hooks.cc @@ -28,7 +28,6 @@ #include "net/android/net_jni_registrar.h" #include "ui/android/ui_jni_registrar.h" #include "jni/LibraryLoader_jni.h" -#include "ui/gfx/android/gfx_jni_registrar.h" namespace { base::AtExitManager* g_at_exit_manager = NULL; @@ -76,7 +75,7 @@ static jint LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz, if (!net::android::RegisterJni(env)) return RESULT_CODE_FAILED_TO_REGISTER_JNI; - if (!ui::RegisterJni(env)) + if (!ui::android::RegisterJni(env)) return RESULT_CODE_FAILED_TO_REGISTER_JNI; if (!content::android::RegisterCommonJni(env)) @@ -91,9 +90,6 @@ static jint LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz, if (!media::RegisterJni(env)) return RESULT_CODE_FAILED_TO_REGISTER_JNI; - if (!gfx::RegisterJni(env)) - return RESULT_CODE_FAILED_TO_REGISTER_JNI; - return 0; } |