Compact Navigation prototype

chrome/browser/ui/views/dropdown_bar_host.cc

 // Copyright (c) 2011 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/ui/views/dropdown_bar_host.h"
 
 #include <algorithm>
 
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/dropdown_bar_view.h"
@@ skipping 26 matching lines @@
 
 // static
 bool DropdownBarHost::disable_animations_during_testing_ = false;
 
 ////////////////////////////////////////////////////////////////////////////////
 // DropdownBarHost, public:
 
 DropdownBarHost::DropdownBarHost(BrowserView* browser_view)
     : browser_view_(browser_view),
       view_(NULL),
+      delegate_(NULL),
       animation_offset_(0),
       focus_manager_(NULL),
       esc_accel_target_registered_(false),
       is_visible_(false) {
 }
 
-void DropdownBarHost::Init(DropdownBarView* view) {
+void DropdownBarHost::Init(views::View* view, Delegate* delegate) {
+  delegate_ = delegate;
   view_ = view;
 
   // Initialize the host.
   host_.reset(views::Widget::CreateWidget());
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL);
   params.delete_on_destroy = false;
   params.parent_widget = browser_view_->GetWidget();
   host_->Init(params);
   host_->SetContentsView(view_);
 
@@ skipping 31 matching lines @@
     if (!is_visible_) {
       // Don't re-start the animation.
       is_visible_ = true;
       animation_->Reset();
       animation_->Show();
     }
   }
 }
 
 void DropdownBarHost::SetFocusAndSelection() {
-  view_->SetFocusAndSelection(true);
+  delegate_->SetFocusAndSelection(true);

[sky, 2011/05/03 18:38:32]

If delegate_ must be non-null, add a DCHECK to that effect when set.

[SteveT, 2011/05/06 18:48:43]

Ah, yes. Done in Init() (and for view, too).

 }
 
 bool DropdownBarHost::IsAnimating() const {
   return animation_->is_animating();
 }
 
 void DropdownBarHost::Hide(bool animate) {
   if (!IsVisible())
     return;
   if (animate && !disable_animations_during_testing_) {
-    animation_->Reset(1.0);
-    animation_->Hide();
+    if (!animation_->IsClosing()) {

[sky, 2011/05/03 18:38:32]

Doesn't slideanimation take care of this for you? Meaning can't you just invoke
Hide? 

[SteveT, 2011/05/06 18:48:43]

Right, that's true. Removed the Reset call.

+      animation_->Reset(1.0);
+      animation_->Hide();
+    }
   } else {
-    StopAnimation();
-    is_visible_ = false;
-    host_->Hide();
+    if (animation_->IsClosing()) {

[sky, 2011/05/03 18:38:32]

I don't understand this code. This is the !animate case, so don't you just want
to stop the animation?
Seems like you're saying the bug is AnimationEnded and you're hacking around it
here. Fix the bug in AnimationEnded without having to hack this.

[SteveT, 2011/05/06 18:48:43]

Sorry - I think my weak comment confused things a bit.
CompactLocationBarViewHost discovered a bug in this original code where, if
|animation_| is not closing, StopAnimation() does not set the state of
|animation_| to not showing, but sets it's own visibility and widget to a hidden
state. So later calls to try to re-show the drop down bar fail (again, because
the animation thinks it's still showing).

We noticed this and fixed it by explicitly calling animation_'s Reset and Hide
methods in the case where we're not closing. I've added a comment in both cases
to explain this.

+      StopAnimation();
+    } else {
+      animation_->Reset();
+      animation_->Hide();
+      // When we call Reset, our AnimationEnded is called when we're not
+      // showing, so our widget is not correctly hidden. Explicitly hide it.
+      is_visible_ = false;
+      host_->Hide();
+    }
   }
 }
 
 void DropdownBarHost::StopAnimation() {
   animation_->End();
 }
 
 bool DropdownBarHost::IsVisible() const {
   return is_visible_;
 }
@@ skipping 32 matching lines @@
   animation_offset_ = static_cast<int>((1.0 - animation_->GetCurrentValue()) *
                                        pref_size.height());
 
   // This call makes sure it appears in the right location, the size and shape
   // is correct and that it slides in the right direction.
   gfx::Rect dlg_rect = GetDialogPosition(gfx::Rect());
   SetDialogPosition(dlg_rect, false);
 
   // Let the view know if we are animating, and at which offset to draw the
   // edges.
-  view_->set_animation_offset(animation_offset_);
+  delegate_->set_animation_offset(animation_offset_);
   view_->SchedulePaint();
 }
 
 void DropdownBarHost::AnimationEnded(const ui::Animation* animation) {
   // Place the dropdown widget in its fully opened state.
   animation_offset_ = 0;
 
   if (!animation_->IsShowing()) {
     // Animation has finished closing.
     host_->Hide();
@@ skipping 130 matching lines @@
   focus_manager_->RegisterAccelerator(escape, this);
   esc_accel_target_registered_ = true;
 }
 
 void DropdownBarHost::UnregisterAccelerators() {
   DCHECK(esc_accel_target_registered_);
   views::Accelerator escape(ui::VKEY_ESCAPE, false, false, false);
   focus_manager_->UnregisterAccelerator(escape, this);
   esc_accel_target_registered_ = false;
 }