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/ui.gyp | |
| 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/ui.gyp')
| -rw-r--r-- | ui/ui.gyp | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -324,8 +324,8 @@ 'base/x/x11_util.cc', 'base/x/x11_util.h', 'base/x/x11_util_internal.h', - 'gfx/android/gfx_jni_registrar.cc', - 'gfx/android/gfx_jni_registrar.h', + 'gfx/android/device_display_info.cc', + 'gfx/android/device_display_info.h', 'gfx/android/java_bitmap.cc', 'gfx/android/java_bitmap.h', 'gfx/android/window_android.cc', @@ -853,6 +853,7 @@ 'type': 'none', 'sources': [ 'android/java/src/org/chromium/ui/gfx/BitmapHelper.java', + 'android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java', 'android/java/src/org/chromium/ui/gfx/NativeWindow.java', 'android/java/src/org/chromium/ui/SelectFileDialog.java', ], |