Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3009)

Unified Diff: ash/frame/caption_buttons/frame_caption_button.h

Issue 934503002: Ash frames: dark frames now use white caption buttons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/frame/caption_buttons/frame_caption_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/frame/caption_buttons/frame_caption_button.h
diff --git a/ash/frame/caption_buttons/frame_caption_button.h b/ash/frame/caption_buttons/frame_caption_button.h
index 05028e4566c543d59867bb572e125f7851d44984..a54461d4eaad90f742b24c7b8091eee4fc378adb 100644
--- a/ash/frame/caption_buttons/frame_caption_button.h
+++ b/ash/frame/caption_buttons/frame_caption_button.h
@@ -38,7 +38,6 @@ class ASH_EXPORT FrameCaptionButton : public views::CustomButton {
void SetImages(CaptionButtonIcon icon,
Animate animate,
int icon_image_id,
- int inactive_icon_image_id,
int hovered_background_image_id,
int pressed_background_image_id);
@@ -69,9 +68,6 @@ class ASH_EXPORT FrameCaptionButton : public views::CustomButton {
void OnGestureEvent(ui::GestureEvent* event) override;
private:
- // Returns the icon image to paint based on |paint_as_active_|.
- const gfx::ImageSkia& GetIconImageToPaint() const;
-
// Paints |to_center| centered within the button with |alpha|.
void PaintCentered(gfx::Canvas* canvas,
const gfx::ImageSkia& to_center,
@@ -88,11 +84,9 @@ class ASH_EXPORT FrameCaptionButton : public views::CustomButton {
// The images and image ids used to paint the button.
int icon_image_id_;
- int inactive_icon_image_id_;
int hovered_background_image_id_;
int pressed_background_image_id_;
gfx::ImageSkia icon_image_;
- gfx::ImageSkia inactive_icon_image_;
gfx::ImageSkia hovered_background_image_;
gfx::ImageSkia pressed_background_image_;
« no previous file with comments | « no previous file | ash/frame/caption_buttons/frame_caption_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698