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

Unified Diff: ash/launcher/overflow_button.h

Issue 22527003: ash:Shelf Overflow Button (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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 | « ash/launcher/overflow_bubble.cc ('k') | ash/launcher/overflow_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/overflow_button.h
diff --git a/ash/launcher/overflow_button.h b/ash/launcher/overflow_button.h
index b1d2db1dbcc358fa2f1911b9a2e0c22ae38c7768..0b225aaa29ef499051248743a73ed5e6e22447ab 100644
--- a/ash/launcher/overflow_button.h
+++ b/ash/launcher/overflow_button.h
@@ -8,12 +8,9 @@
#include "ash/shelf/shelf_types.h"
#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "ui/gfx/image/image_skia.h"
#include "ui/views/controls/button/custom_button.h"
-namespace gfx {
-class ImageSkia;
-}
-
namespace ash {
namespace internal {
@@ -31,7 +28,12 @@ class OverflowButton : public views::CustomButton {
// views::View overrides:
virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
- const gfx::ImageSkia* image_;
+ // Left and right images are rotations of bottom_image and are
+ // owned by the overflow button.
+ gfx::ImageSkia left_image_;
+ gfx::ImageSkia right_image_;
+ // Bottom image is owned by the resource bundle.
+ const gfx::ImageSkia* bottom_image_;
DISALLOW_COPY_AND_ASSIGN(OverflowButton);
};
« no previous file with comments | « ash/launcher/overflow_bubble.cc ('k') | ash/launcher/overflow_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698