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_host_delegate.h"
 #include "chrome/browser/ui/views/dropdown_bar_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/scrollbar_size.h"
 #include "views/focus/external_focus_tracker.h"
 #include "views/focus/view_storage.h"
 #include "views/widget/widget.h"
 
@@ skipping 17 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,
+                           DropdownBarHostDelegate* delegate) {
+  DCHECK(view);
+  DCHECK(delegate);
+
   view_ = view;
+  delegate_ = delegate;
 
   // 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_);
 
   // Start listening to focus changes, so we can register and unregister our
@@ skipping 30 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);
 }
 
 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/09 14:27:22]

Do you really need the if?

[SteveT, 2011/05/09 19:40:04]

No - removed.

+      animation_->Hide();
+    }
   } else {
-    StopAnimation();
-    is_visible_ = false;
-    host_->Hide();
+    if (animation_->IsClosing()) {
+      // If we're in the middle of a close animation, skip immediately to the
+      // end of the animation.
+      StopAnimation();
+    } else {
+      // Otherwise we need to set both the animation state to ended and the
+      // DropdownBarHost state to ended/hidden, otherwise the next time we try
+      // to show the bar, it might refuse to do so. Note that we call
+      // AnimationEnded ourselves as Reset does not call it if we are not
+      // animating here.
+      animation_->Reset();
+      animation_->Hide();

[sky, 2011/05/09 14:27:22]

I don't think you need the hide here.

[SteveT, 2011/05/09 19:40:04]

Yes - The reset will put animation_ back in the correct hidden state, and the
call to AnimationEnded does the same for DropdownBarHost. Removed.

+      AnimationEnded(animation_.get());
+    }
   }
 }
 
 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_->SetAnimationOffset(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;
 }