diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-20 00:21:45 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-20 00:21:45 +0000 |
| commit | dad4661819c280d4468548864442face8082b0b2 (patch) | |
| tree | 627e91e922b678d227f1fe40ec131be295db59f7 /ash/wm/workspace | |
| parent | 5951c851f2b1024645553a5657330c4005a5e3e3 (diff) | |
| download | chromium_src-dad4661819c280d4468548864442face8082b0b2.zip chromium_src-dad4661819c280d4468548864442face8082b0b2.tar.gz chromium_src-dad4661819c280d4468548864442face8082b0b2.tar.bz2 | |
Make ImageButton and NetworkMenuIcon work in high DPI
Test=Manual
Bug=None
Testing steps
1) Run chromium using --force-device-scale-factor=2 --highlight-missing-2x-resources --load-2x-resources
2) Ensure that the hot image is not pixelated
Review URL: https://chromiumcodereview.appspot.com/10546160
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143092 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/workspace')
| -rw-r--r-- | ash/wm/workspace/frame_maximize_button.cc | 4 | ||||
| -rw-r--r-- | ash/wm/workspace/frame_maximize_button.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ash/wm/workspace/frame_maximize_button.cc b/ash/wm/workspace/frame_maximize_button.cc index a3942f5..360f49c 100644 --- a/ash/wm/workspace/frame_maximize_button.cc +++ b/ash/wm/workspace/frame_maximize_button.cc @@ -179,7 +179,7 @@ ui::GestureStatus FrameMaximizeButton::OnGestureEvent( return ImageButton::OnGestureEvent(event); } -gfx::ImageSkia FrameMaximizeButton::GetImageToPaint() { +gfx::ImageSkia FrameMaximizeButton::GetImageToPaint(float scale) { if (is_snap_enabled_) { int id = 0; if (frame_->GetWidget()->IsMaximized()) { @@ -224,7 +224,7 @@ gfx::ImageSkia FrameMaximizeButton::GetImageToPaint() { return *ResourceBundle::GetSharedInstance().GetImageNamed(id).ToImageSkia(); } // Hot and pressed states handled by regular ImageButton. - return ImageButton::GetImageToPaint(); + return ImageButton::GetImageToPaint(scale); } void FrameMaximizeButton::ProcessStartEvent(const views::LocatedEvent& event) { diff --git a/ash/wm/workspace/frame_maximize_button.h b/ash/wm/workspace/frame_maximize_button.h index 4d51ae3..aa26249 100644 --- a/ash/wm/workspace/frame_maximize_button.h +++ b/ash/wm/workspace/frame_maximize_button.h @@ -40,7 +40,7 @@ class ASH_EXPORT FrameMaximizeButton : public views::ImageButton { protected: // ImageButton overrides: - virtual gfx::ImageSkia GetImageToPaint() OVERRIDE; + virtual gfx::ImageSkia GetImageToPaint(float scale) OVERRIDE; private: class EscapeEventFilter; |