diff options
| author | oshima <oshima@chromium.org> | 2014-09-02 16:31:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-02 23:34:25 +0000 |
| commit | 963c8527b331983a8f8ccb7d11aec2a50a6fcf77 (patch) | |
| tree | d875bbcbee9226f0011eead96441885f56b6d45d /extensions/browser/extension_icon_image.cc | |
| parent | f60ff9c56edd5b26c3b8ebeef8d7c1d3b30a811d (diff) | |
| download | chromium_src-963c8527b331983a8f8ccb7d11aec2a50a6fcf77.zip chromium_src-963c8527b331983a8f8ccb7d11aec2a50a6fcf77.tar.gz chromium_src-963c8527b331983a8f8ccb7d11aec2a50a6fcf77.tar.bz2 | |
Run athena on chrome
There are more work needs to be finished, but this should at least allow us to implement login UI
* Added chrome version of ExtensionsDelegate and AppActivity
* introduce use_athena gyp flag
* disabled features/code path that does not work yet on athena. Filed bugs to keep track of them.
BUG=397167
R=mukai@chromium.org, yoz@chromium.org
Review URL: https://codereview.chromium.org/514293003
Cr-Commit-Position: refs/heads/master@{#293023}
Diffstat (limited to 'extensions/browser/extension_icon_image.cc')
| -rw-r--r-- | extensions/browser/extension_icon_image.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/extensions/browser/extension_icon_image.cc b/extensions/browser/extension_icon_image.cc index 14ba290..5d23b1c 100644 --- a/extensions/browser/extension_icon_image.cc +++ b/extensions/browser/extension_icon_image.cc @@ -210,7 +210,11 @@ void IconImage::OnImageLoaded(float scale, const gfx::Image& image_in) { gfx::ImageSkiaRep rep = image->GetRepresentation(scale); DCHECK(!rep.is_null()); +#if !defined(USE_ATHENA) + // TODO(oshima): It someshow gets 2x image for 1x for some extensions. Fix + // this. DCHECK_EQ(scale, rep.scale()); +#endif // Remove old representation if there is one. image_skia_.RemoveRepresentation(scale); |