Update drop down menu look & feel

ui/views/controls/menu/menu_item_view.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
 #define UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 82 matching lines @@
     TOPRIGHT
   };
 
   // Where the menu should be drawn, above or below the bounds (when
   // the bounds is non-empty).  POSITION_BEST_FIT (default) positions
   // the menu below the bounds unless the menu does not fit on the
   // screen and the re is more space above.
   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
   // shown to the user, rather its use as the parent for all menu items.
   explicit MenuItemView(MenuDelegate* delegate);
 
   // Overridden from View:
   virtual bool GetTooltipText(const gfx::Point& p,
                               string16* tooltip) const OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
@@ skipping 95 matching lines @@
   MenuItemView* GetParentMenuItem() { return parent_menu_item_; }
   const MenuItemView* GetParentMenuItem() const { return parent_menu_item_; }
 
   // Sets/Gets the title.
   void SetTitle(const string16& title);
   const string16& title() const { return title_; }
 
   // 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);
 
   // Returns true if the item is selected.
   bool IsSelected() const { return selected_; }
 
   // Sets the |tooltip| for a menu item view with |item_id| identifier.
   void SetTooltip(const string16& tooltip, int item_id);
 
@@ skipping 58 matching lines @@
   int GetAcceleratorTextWidth();
 
   // Returns true if the menu has mnemonics. This only useful on the root menu
   // item.
   bool has_mnemonics() const { return has_mnemonics_; }
 
   // Set top and bottom margins in pixels.  If no margin is set or a
   // 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;
   }
 
  protected:
   // Creates a MenuItemView. This is used by the various AddXXX methods.
   MenuItemView(MenuItemView* parent, int command, Type type);
 
   // MenuRunner owns MenuItemView and should be the only one deleting it.
@@ skipping 69 matching lines @@
   void DestroyAllMenuHosts();
 
   // Returns the accelerator text.
   string16 GetAcceleratorText();
 
   // Calculates the preferred size.
   gfx::Size CalculatePreferredSize();
 
   // 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; }
 
   // Returns true if this MenuItemView contains a single child
   // that is responsible for rendering the content.
   bool IsContainer() const;
 
   // Returns number of child views excluding icon_view.
   int NonIconChildViewsCount() const;
@@ skipping 63 matching lines @@
   // GetPreferredSize.
   gfx::Size pref_size_;
 
   // Removed items to be deleted in ChildrenChanged().
   std::vector<View*> removed_items_;
 
   // Margins in pixels.
   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 menu_position. That's why the
code has the two fields.

[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.
   bool use_right_margin_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuItemView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_