diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 07:28:40 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 07:28:40 +0000 |
| commit | 0a4cf456d7ac8a546c72d43b259513e0dc07ab17 (patch) | |
| tree | dccfaa43d1c090c9fe40f8814304d6355f595b75 /ash/shell | |
| parent | acf2474114d7d07c35553a23f70212b66bcdaab7 (diff) | |
| download | chromium_src-0a4cf456d7ac8a546c72d43b259513e0dc07ab17.zip chromium_src-0a4cf456d7ac8a546c72d43b259513e0dc07ab17.tar.gz chromium_src-0a4cf456d7ac8a546c72d43b259513e0dc07ab17.tar.bz2 | |
Load the resources for max scale factor first.
- made SCALE_FACTOR_NONE != SCALE_FACTOR_100P
- updated a few places that used SCALE_FACTOR_NONE to load
100P images
- Don't include 200P to supported scale factor unless
we have 200P assets (on chromeos)
BUG=156569
TEST=covered by test.
Review URL: https://chromiumcodereview.appspot.com/11301007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167622 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
| -rw-r--r-- | ash/shell/window_watcher.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc index 97fee7d..157a598 100644 --- a/ash/shell/window_watcher.cc +++ b/ash/shell/window_watcher.cc @@ -91,7 +91,7 @@ void WindowWatcher::OnWindowAdded(aura::Window* new_window) { image_count == 2 ? 255 : 0); image_count = (image_count + 1) % 3; item.image = gfx::ImageSkia(gfx::ImageSkiaRep(icon_bitmap, - ui::SCALE_FACTOR_NONE)); + ui::SCALE_FACTOR_100P)); model->Add(item); } |