Fixes a couple of bookmark bar bugs:...

chrome/browser/views/bookmark_bar_view.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/views/bookmark_bar_view.h"
 
 #include <limits>
 
 #include "base/base_drag_source.h"
 #include "base/gfx/skia_utils.h"
@@ skipping 125 matching lines @@
 // Border color along the left edge of the view representing the most recently
 // view pages.
 static const SkColor kSeparatorColor = SkColorSetRGB(194, 205, 212);
 
 // Left-padding for the instructional text.
 static const int kInstructionsPadding = 6;
 
 // Color of the instructional text.
 static const SkColor kInstructionsColor = SkColorSetRGB(128, 128, 142);
 
+// Tag for the other button.
+static const int kOtherFolderButtonTag = 1;
+
 namespace {
 
 // Calculates the drop operation given the event and supported set of
 // operations.
 int PreferredDropOperation(const DropTargetEvent& event, int operation) {
   int common_ops = (event.GetSourceOperations() & operation);
   if (!common_ops)
     return 0;
   if (DragDropTypes::DRAG_COPY & common_ops)
     return DragDropTypes::DRAG_COPY;
@@ skipping 91 matching lines @@
     return !tooltip->empty();
   }
 
   virtual bool IsTriggerableEvent(const ChromeViews::MouseEvent& e) {
     return event_utils::IsPossibleDispositionEvent(e);
   }
 
   virtual void Paint(ChromeCanvas *canvas) {
     ChromeViews::TextButton::Paint(canvas);
 
+    PaintAnimation(this, canvas, show_animation_->GetCurrentValue());
+  }
+
+  static void PaintAnimation(ChromeViews::View* view,
+                             ChromeCanvas* canvas,
+                             double animation_value) {
     // Since we can't change the alpha of the button (it contains un-alphable
     // text), we paint the bar background over the front of the button. As the
     // bar background is a gradient, we have to paint the gradient at the
     // size of the parent (hence all the margin math below). We can't use
     // the parent's actual bounds because they differ from what is painted.
     SkPaint paint;
-    paint.setAlpha(static_cast<int>(
-        (1.0 - show_animation_->GetCurrentValue()) * 255));
+    paint.setAlpha(static_cast<int>((1.0 - animation_value) * 255));
     paint.setShader(gfx::CreateGradientShader(0,
-        height() + kTopMargin + kBottomMargin,
+        view->height() + kTopMargin + kBottomMargin,
         kTopBorderColor,
         kBackgroundColor))->safeUnref();
-    canvas->FillRectInt(0, -kTopMargin, width(),
-                        height() + kTopMargin + kBottomMargin, paint);
-  }
-
-  virtual void AnimationProgressed(const Animation* animation) {
-    ChromeViews::TextButton::AnimationProgressed(animation);
-    SchedulePaint();
+    canvas->FillRectInt(0, -kTopMargin, view->width(),
+                        view->height() + kTopMargin + kBottomMargin, paint);
   }
 
  private:
   const GURL& url_;
   Profile* profile_;
   scoped_ptr<SlideAnimation> show_animation_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkButton);
 };
 
+// BookmarkFolderButton -------------------------------------------------------
+
+// Buttons used for folders on the bookmark bar, including the 'other folders'
+// button.
+class BookmarkFolderButton : public ChromeViews::MenuButton {
+ public:
+  BookmarkFolderButton(const std::wstring& title,
+                       ChromeViews::ViewMenuDelegate* menu_delegate,
+                       bool show_menu_marker)
+      : MenuButton(title, menu_delegate, show_menu_marker) {
+    show_animation_.reset(new SlideAnimation(this));
+    if (BookmarkBarView::testing_) {
+      // For some reason during testing the events generated by animating
+      // throw off the test. So, don't animate while testing.
+      show_animation_->Reset(1);
+    } else {
+      show_animation_->Show();
+    }
+  }
+
+  virtual bool IsTriggerableEvent(const ChromeViews::MouseEvent& e) {
+    // This is hard coded to avoid potential notification on left mouse down,
+    // which we want to show the menu.
+    return e.IsMiddleMouseButton();
+  }
+
+  virtual void Paint(ChromeCanvas *canvas) {
+    ChromeViews::MenuButton::Paint(canvas, false);
+
+    BookmarkButton::PaintAnimation(this, canvas,
+                                   show_animation_->GetCurrentValue());
+  }
+
+ private:
+  scoped_ptr<SlideAnimation> show_animation_;
+
+  DISALLOW_COPY_AND_ASSIGN(BookmarkFolderButton);
+};
+
 // DropInfo -------------------------------------------------------------------
 
 // Tracks drops on the BookmarkBarView.
 
 struct DropInfo {
   DropInfo() : drop_index(-1), is_menu_showing(false), valid(false) {}
 
   // Whether the data is valid.
   bool valid;
 
@@ skipping 83 matching lines @@
   }
 
  private:
   // Creates an entry in menu for each child node of parent starting at
   // start_child_index, recursively invoking this for any star groups.
   void BuildMenu(BookmarkNode* parent,
                  int start_child_index,
                  MenuItemView* menu,
                  int* next_menu_id) {
     DCHECK(!parent->GetChildCount() ||
+
            start_child_index < parent->GetChildCount());
     for (int i = start_child_index; i < parent->GetChildCount(); ++i) {
       BookmarkNode* node = parent->GetChild(i);
       int id = *next_menu_id;
 
       (*next_menu_id)++;
       if (node->GetType() == history::StarredEntry::URL) {
         SkBitmap icon = node->GetFavIcon();
         if (icon.width() == 0)
           icon = *kDefaultFavIcon;
@@ skipping 721 matching lines @@
       rb.GetFont(ResourceBundle::BaseFont));
   instructions_->SetColor(kInstructionsColor);
   AddChildView(instructions_);
 
   SetContextMenuController(this);
 
   size_animation_.reset(new SlideAnimation(this));
 }
 
 MenuButton* BookmarkBarView::CreateOtherBookmarkedButton() {
-  MenuButton* button = new MenuButton(
+  MenuButton* button = new BookmarkFolderButton(
       l10n_util::GetString(IDS_BOOMARK_BAR_OTHER_BOOKMARKED), this, false);
   button->SetIcon(GetGroupIcon());
   button->SetContextMenuController(this);
+  button->SetListener(this, kOtherFolderButtonTag);
   return button;
 }
 
 MenuButton* BookmarkBarView::CreateOverflowButton() {
   MenuButton* button = new MenuButton(std::wstring(), this, false);
   button->SetIcon(*ResourceBundle::GetSharedInstance().
                   GetBitmapNamed(IDR_BOOKMARK_BAR_CHEVRONS));
 
   // The overflow button's image contains an arrow and therefore it is a
   // direction sensitive image and we need to flip it if the UI layout is
@@ skipping 220 matching lines @@
   menu_runner_.reset(new MenuRunner(this, node, start_index));
   HWND parent_hwnd = GetViewContainer()->GetHWND();
   menu_runner_->RunMenuAt(parent_hwnd,
                           gfx::Rect(screen_loc.x, screen_loc.y,
                                     view->width(), bar_height),
                           anchor_point,
                           false);
 }
 
 void BookmarkBarView::ButtonPressed(ChromeViews::BaseButton* sender) {
-  int index = GetChildIndex(sender);
-  DCHECK(index != -1);
-  BookmarkNode* node = model_->GetBookmarkBarNode()->GetChild(index);
+  BookmarkNode* node;
+  if (sender->GetTag() == kOtherFolderButtonTag) {
+    node = model_->other_node();
+  } else {
+    int index = GetChildIndex(sender);
+    DCHECK(index != -1);
+    node = model_->GetBookmarkBarNode()->GetChild(index);
+  }
   DCHECK(page_navigator_);
-  page_navigator_->OpenURL(
-      node->GetURL(),
-      event_utils::DispositionFromEventFlags(sender->mouse_event_flags()),
-      PageTransition::AUTO_BOOKMARK);
+  if (node->is_url()) {
+    page_navigator_->OpenURL(
+        node->GetURL(),
+        event_utils::DispositionFromEventFlags(sender->mouse_event_flags()),
+        PageTransition::AUTO_BOOKMARK);
+  } else {
+    BookmarkBarContextMenuController::OpenAll(
+        GetViewContainer()->GetHWND(), GetPageNavigator(), node,
+        event_utils::DispositionFromEventFlags(sender->mouse_event_flags()));
+  }
   UserMetrics::RecordAction(L"ClickedBookmarkBarURLButton", profile_);
 }
 
 void BookmarkBarView::ShowContextMenu(View* source,
                                       int x,
                                       int y,
                                       bool is_mouse_gesture) {
   if (!model_->IsLoaded()) {
     // Don't do anything if the model isn't loaded.
     return;
@@ skipping 17 matching lines @@
 ChromeViews::View* BookmarkBarView::CreateBookmarkButton(BookmarkNode* node) {
   if (node->GetType() == history::StarredEntry::URL) {
     BookmarkButton* button = new BookmarkButton(node->GetURL(),
                                                 node->GetTitle(),
                                                 GetProfile());
     button->SetListener(this, 0);
     ConfigureButton(node, button);
     return button;
   } else {
     ChromeViews::MenuButton* button =
-        new ChromeViews::MenuButton(node->GetTitle(), this, false);
+        new BookmarkFolderButton(node->GetTitle(), this, false);
     button->SetIcon(GetGroupIcon());
+    button->SetListener(this, 0);
     ConfigureButton(node, button);
     return button;
   }
 }
 
 void BookmarkBarView::ConfigureButton(BookmarkNode* node,
                                       ChromeViews::TextButton* button) {
   button->SetText(node->GetTitle());
   button->ClearMaxTextSize();
   button->SetContextMenuController(this);
@@ skipping 369 matching lines @@
 }
 
 void BookmarkBarView::StopThrobbing(bool immediate) {
   if (!throbbing_view_)
     return;
 
   // If not immediate, cycle through 2 more complete cycles.
   throbbing_view_->StartThrobbing(immediate ? 0 : 4);
   throbbing_view_ = NULL;
 }