summaryrefslogtreecommitdiffstats
path: root/ash/launcher/overflow_button.h
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-05 01:47:23 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-05 01:47:23 +0000
commit1fcfb9986bb54e8a8b8f98b3eefcf99486f70bf7 (patch)
tree7f8d2de39c9774a1f45afda0345b3aee83f38025 /ash/launcher/overflow_button.h
parent51772fa550db198e7741414aeded8848191b6308 (diff)
downloadchromium_src-1fcfb9986bb54e8a8b8f98b3eefcf99486f70bf7.zip
chromium_src-1fcfb9986bb54e8a8b8f98b3eefcf99486f70bf7.tar.gz
chromium_src-1fcfb9986bb54e8a8b8f98b3eefcf99486f70bf7.tar.bz2
Use the correct launcher assets for shelf alignment.
Cleanup: remove redundant shelf code. - replaces switch to get values for alignment with template - eliminate alignment member variables and use shelf_layout_manager where possible. other minor clean ups: remove unnecessary namespace, use member variable. BUG=151417 TEST=none Review URL: https://chromiumcodereview.appspot.com/11434099 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171120 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher/overflow_button.h')
-rw-r--r--ash/launcher/overflow_button.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/ash/launcher/overflow_button.h b/ash/launcher/overflow_button.h
index be24ba6..69cc795 100644
--- a/ash/launcher/overflow_button.h
+++ b/ash/launcher/overflow_button.h
@@ -23,7 +23,7 @@ class OverflowButton : public views::CustomButton {
explicit OverflowButton(views::ButtonListener* listener);
virtual ~OverflowButton();
- void SetShelfAlignment(ShelfAlignment alignment);
+ void OnShelfAlignmentChanged();
private:
void PaintBackground(gfx::Canvas* canvas, int alpha);
@@ -31,7 +31,6 @@ class OverflowButton : public views::CustomButton {
// views::View overrides:
virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
- ShelfAlignment alignment_;
const gfx::ImageSkia* image_;
DISALLOW_COPY_AND_ASSIGN(OverflowButton);