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

Unified Diff: ui/views/controls/menu/menu_item_view.h

Issue 10829176: Update drop down menu look & feel (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Delete POSITION_OVER_BOUNDS related code Created 8 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
Index: ui/views/controls/menu/menu_item_view.h
diff --git a/ui/views/controls/menu/menu_item_view.h b/ui/views/controls/menu/menu_item_view.h
index 03ef36ee12b3591d8f28c28b03428572e43f7c1f..1bbed7bde54388e2e2df2ff231797d60bb27dcf5 100644
--- a/ui/views/controls/menu/menu_item_view.h
+++ b/ui/views/controls/menu/menu_item_view.h
@@ -100,8 +100,7 @@ class VIEWS_EXPORT MenuItemView : public View {
enum MenuPosition {
POSITION_BEST_FIT,
POSITION_ABOVE_BOUNDS,
- POSITION_BELOW_BOUNDS,
- POSITION_OVER_BOUNDS
+ POSITION_BELOW_BOUNDS
};
// Constructor for use with the top level menu item. This menu is never
@@ -217,11 +216,6 @@ class VIEWS_EXPORT MenuItemView : public View {
// Returns the type of this menu.
const Type& GetType() const { return type_; }
- // Returns the requested menu position.
- const MenuPosition& GetRequestedMenuPosition() {
- return requested_menu_position_;
- }
-
// Sets whether this item is selected. This is invoked as the user moves
// the mouse around the menu while open.
void SetSelected(bool selected);
@@ -300,12 +294,6 @@ class VIEWS_EXPORT MenuItemView : public View {
// negative margin is specified then MenuConfig values are used.
void SetMargins(int top_margin, int bottom_margin);
- // Set the position of the menu with respect to the bounds (top
- // level only).
- void set_menu_position(MenuPosition menu_position) {
- requested_menu_position_ = menu_position;
- }
-
// Suppress the right margin if this is set to false.
void set_use_right_margin(bool use_right_margin) {
use_right_margin_ = use_right_margin;
@@ -395,9 +383,9 @@ class VIEWS_EXPORT MenuItemView : public View {
// Used by MenuController to cache the menu position in use by the
// active menu.
- MenuPosition actual_menu_position() const { return actual_menu_position_; }
- void set_actual_menu_position(MenuPosition actual_menu_position) {
- actual_menu_position_ = actual_menu_position;
+ MenuPosition menu_position() const { return menu_position_; }
+ void set_menu_position(MenuPosition menu_position) {
+ menu_position_ = menu_position;
}
void set_controller(MenuController* controller) { controller_ = controller; }
@@ -481,11 +469,9 @@ class VIEWS_EXPORT MenuItemView : public View {
int top_margin_;
int bottom_margin_;
- // |menu_position_| is the requested position with respect to the bounds.
- // |actual_menu_position_| is used by the controller to cache the
+ // |menu_position_| is used by the controller to cache the
// position of the menu being shown.
- MenuPosition requested_menu_position_;
- MenuPosition actual_menu_position_;
+ MenuPosition menu_position_;
sky 2012/08/07 00:31:57 I don't like that showing a menu many change the m
Harry McCleave 2012/08/07 01:26:36 Done.
// If set to false, the right margin will be removed for menu lines
// containing other elements.

Powered by Google App Engine
This is Rietveld 408576698