Repositioning of the dimmer overlay when the shelf gets only moved and not resized.

ash/shelf/shelf_widget.cc

 // 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.
 
 #include "ash/shelf/shelf_widget.h"
 
 #include "ash/ash_switches.h"
 #include "ash/focus_cycler.h"
 #include "ash/launcher/launcher_delegate.h"
 #include "ash/launcher/launcher_model.h"
@@ skipping 220 matching lines @@
 }
 
 }  // namespace
 
 namespace ash {
 
 // The contents view of the Shelf. This view contains LauncherView and
 // sizes it to the width of the shelf minus the size of the status area.
 class ShelfWidget::DelegateView : public views::WidgetDelegate,
                                   public views::AccessiblePaneView,
-                                  public internal::BackgroundAnimatorDelegate {
+                                  public internal::BackgroundAnimatorDelegate,
+                                  public aura::WindowObserver {
  public:
   explicit DelegateView(ShelfWidget* shelf);
   virtual ~DelegateView();
 
   void set_focus_cycler(internal::FocusCycler* focus_cycler) {
     focus_cycler_ = focus_cycler;
   }
   internal::FocusCycler* focus_cycler() {
     return focus_cycler_;
   }
@@ skipping 13 matching lines @@
   virtual views::Widget* GetWidget() OVERRIDE {
     return View::GetWidget();
   }
   virtual const views::Widget* GetWidget() const OVERRIDE {
     return View::GetWidget();
   }
 
   virtual bool CanActivate() const OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual void ReorderChildLayers(ui::Layer* parent_layer) OVERRIDE;
+  // This will be called when the parent local bounds change.
   virtual void OnBoundsChanged(const gfx::Rect& old_bounds) OVERRIDE;
 
+  // aura::WindowObserver overrides.

[James Cook, 2013/09/05 23:41:00]

tiny nit: "overrides:" instead of "overrides."

[Mr4D (OOO till 08-26), 2013/09/05 23:47:26]

Done

+  // This will be called when the shelf itself changes its absolute position.
+  // Since the |dimmer_| panel needs to be placed in screen coordinates it needs
+  // to be repositioned. The difference to the OnBoundsChanged call above is
+  // that this gets also triggered when the shelf only moves.
+  virtual void OnWindowBoundsChanged(aura::Window* window,
+                                     const gfx::Rect& old_bounds,
+                                     const gfx::Rect& new_bounds) OVERRIDE;
+
   // BackgroundAnimatorDelegate overrides:
   virtual void UpdateBackground(int alpha) OVERRIDE;
 
   // Force the shelf to be presented in an undimmed state.
   void ForceUndimming(bool force);
 
   // A function to test the current alpha used by the dimming bar. If there is
   // no dimmer active, the function will return -1.
   int GetDimmingAlphaForTest();
 
@@ skipping 30 matching lines @@
       opaque_background_(ui::LAYER_SOLID_COLOR),
       dimmer_view_(NULL),
       disable_dimming_animations_for_test_(false) {
   set_allow_deactivate_on_esc(true);
   opaque_background_.SetColor(SK_ColorBLACK);
   opaque_background_.SetBounds(GetLocalBounds());
   opaque_background_.SetOpacity(0.0f);
 }
 
 ShelfWidget::DelegateView::~DelegateView() {
+  // Make sure that the dimmer goes away since it might have set an observer.
+  SetDimmed(false);
 }
 
 void ShelfWidget::DelegateView::SetDimmed(bool value) {
   if (value == (dimmer_.get() != NULL))
     return;
 
   if (value) {
     dimmer_.reset(new views::Widget);
     views::Widget::InitParams params(
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
     params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
     params.can_activate = false;
     params.accept_events = false;
     params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     params.parent = shelf_->GetNativeView();
     dimmer_->Init(params);
     dimmer_->GetNativeWindow()->SetName("ShelfDimmer");
     dimmer_->SetBounds(shelf_->GetWindowBoundsInScreen());
     // The launcher should not take focus when it is initially shown.
     dimmer_->set_focus_on_creation(false);
     dimmer_view_ = new DimmerView(shelf_, disable_dimming_animations_for_test_);
     dimmer_->SetContentsView(dimmer_view_);
     dimmer_->GetNativeView()->SetName("ShelfDimmerView");
     dimmer_->Show();
+    shelf_->GetNativeView()->AddObserver(this);
   } else {
+    shelf_->GetNativeView()->RemoveObserver(this);
     dimmer_view_ = NULL;
     dimmer_.reset(NULL);
   }
 }
 
 bool ShelfWidget::DelegateView::GetDimmed() const {
   return dimmer_.get() && dimmer_->IsVisible();
 }
 
 void ShelfWidget::DelegateView::SetParentLayer(ui::Layer* layer) {
@@ skipping 59 matching lines @@
   views::View::ReorderChildLayers(parent_layer);
   parent_layer->StackAtBottom(&opaque_background_);
 }
 
 void ShelfWidget::DelegateView::OnBoundsChanged(const gfx::Rect& old_bounds) {
   opaque_background_.SetBounds(GetLocalBounds());
   if (dimmer_)
     dimmer_->SetBounds(GetBoundsInScreen());
 }
 
+void ShelfWidget::DelegateView::OnWindowBoundsChanged(
+    aura::Window* window,
+    const gfx::Rect& old_bounds,
+    const gfx::Rect& new_bounds) {
+  // coming here the shelf got repositioned and since the |dimmer_| is placed

[James Cook, 2013/09/05 23:41:00]

nit: coming -> Coming

[Mr4D (OOO till 08-26), 2013/09/05 23:47:26]

Done.

+  // in screen coordinates and not relative to the parent it needs to be
+  // repositioned accordingly.
+  dimmer_->SetBounds(GetBoundsInScreen());
+}
+
 void ShelfWidget::DelegateView::ForceUndimming(bool force) {
   if (GetDimmed())
     dimmer_view_->ForceUndimming(force);
 }
 
 int ShelfWidget::DelegateView::GetDimmingAlphaForTest() {
   if (GetDimmed())
     return dimmer_view_->get_dimming_alpha_for_test();
   return -1;
 }
@@ skipping 206 matching lines @@
     return delegate_view_->GetDimmerBoundsForTest();
   return gfx::Rect();
 }
 
 void ShelfWidget::DisableDimmingAnimationsForTest() {
   DCHECK(delegate_view_);
   return delegate_view_->disable_dimming_animations_for_test();
 }
 
 }  // namespace ash