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

Unified Diff: ash/launcher/launcher_view.h

Issue 11434099: Use the correct launcher assets for shelf alignment. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years 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/launcher_tooltip_manager_unittest.cc ('k') | ash/launcher/launcher_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher_view.h
diff --git a/ash/launcher/launcher_view.h b/ash/launcher/launcher_view.h
index f52bb8d2cad4f873dfb179872917857e06732aa8..563577ff9737387a52e6660423ffbdd5bdcc621d 100644
--- a/ash/launcher/launcher_view.h
+++ b/ash/launcher/launcher_view.h
@@ -106,21 +106,6 @@ class ASH_EXPORT LauncherView : public views::View,
gfx::Rect overflow_bounds;
};
- // Used in calculating ideal bounds.
- int primary_axis_coordinate(int x, int y) const {
- return is_horizontal_alignment() ? x : y;
- }
-
- bool is_horizontal_alignment() const {
- return alignment_ == SHELF_ALIGNMENT_BOTTOM;
- }
-
- // Used in calculating ideal bounds.
- int alignment_based_value(int bottom, int left, int right) const {
- return (SHELF_ALIGNMENT_BOTTOM == alignment_ ? bottom :
- (SHELF_ALIGNMENT_LEFT == alignment_ ? left : right));
- }
-
bool is_overflow_mode() const {
return first_visible_index_ > 0;
}
@@ -209,7 +194,6 @@ class ASH_EXPORT LauncherView : public views::View,
virtual void MouseMovedOverButton(views::View* view) OVERRIDE;
virtual void MouseEnteredButton(views::View* view) OVERRIDE;
virtual void MouseExitedButton(views::View* view) OVERRIDE;
- virtual ShelfAlignment GetShelfAlignment() const OVERRIDE;
virtual string16 GetAccessibleName(const views::View* view) OVERRIDE;
// Overridden from views::ButtonListener:
« no previous file with comments | « ash/launcher/launcher_tooltip_manager_unittest.cc ('k') | ash/launcher/launcher_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698