Adds support for invisible menu items to bookmark menus and wires it

views/controls/menu/submenu_view.cc

 // Copyright (c) 2010 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.
 
 #include "views/controls/menu/submenu_view.h"
 
 #include "gfx/canvas.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_host.h"
@@ skipping 68 matching lines @@
   else
     new_y = 0;
   SetBounds(x(), new_y, parent->width(), pref_height);
 
   gfx::Insets insets = GetInsets();
   int x = insets.left();
   int y = insets.top();
   int menu_item_width = width() - insets.width();
   for (int i = 0; i < GetChildViewCount(); ++i) {
     View* child = GetChildViewAt(i);
-    gfx::Size child_pref_size = child->GetPreferredSize();
-    child->SetBounds(x, y, menu_item_width, child_pref_size.height());
-    y += child_pref_size.height();
+    if (child->IsVisible()) {
+      gfx::Size child_pref_size = child->GetPreferredSize();
+      child->SetBounds(x, y, menu_item_width, child_pref_size.height());
+      y += child_pref_size.height();
+    }
   }
 }
 
 gfx::Size SubmenuView::GetPreferredSize() {
   if (GetChildViewCount() == 0)
     return gfx::Size();
 
   max_accelerator_width_ = 0;
   int max_width = 0;
   int height = 0;
   for (int i = 0; i < GetChildViewCount(); ++i) {
     View* child = GetChildViewAt(i);
-    gfx::Size child_pref_size = child->GetPreferredSize();
+    gfx::Size child_pref_size = child->IsVisible() ?
+        child->GetPreferredSize() : gfx::Size();
     max_width = std::max(max_width, child_pref_size.width());
     height += child_pref_size.height();
     if (child->GetID() == MenuItemView::kMenuItemViewID) {
       MenuItemView* menu = static_cast<MenuItemView*>(child);
       max_accelerator_width_ =
           std::max(max_accelerator_width_, menu->GetAcceleratorTextWidth());
     }
   }
   if (max_accelerator_width_ > 0) {
     max_accelerator_width_ +=
@@ skipping 256 matching lines @@
       item_bounds.set_height(kDropIndicatorHeight);
       return item_bounds;
 
     default:
       // Don't render anything for on.
       return gfx::Rect();
   }
 }
 
 }  // namespace views