Prevent a user from hiding the shelf via a gesture when there are no visible windows part 2

ash/shelf/shelf_layout_manager.h

 // 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.
 
 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
 
 #include <vector>
 
 #include "ash/ash_export.h"
@@ skipping 15 matching lines @@
 #include "ui/gfx/rect.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_controller_observer.h"
 
 namespace aura {
 class RootWindow;
 }
 
 namespace ui {
 class GestureEvent;
+class ImplicitAnimationObserver;
 }
 
 namespace ash {
 class ScreenAsh;
 class ShelfLayoutManagerObserver;
 class ShelfWidget;
 namespace internal {
 
 class PanelLayoutManagerTest;
 class ShelfBezelEventFilter;
@@ skipping 45 matching lines @@
 
   // Sets the alignment. Returns true if the alignment is changed. Otherwise,
   // returns false.
   bool SetAlignment(ShelfAlignment alignment);
   ShelfAlignment GetAlignment() const { return alignment_; }
 
   void set_workspace_controller(WorkspaceController* controller) {
     workspace_controller_ = controller;
   }
 
-  bool in_layout() const { return in_layout_; }
+  bool updating_bounds() const { return updating_bounds_; }
 
   // Clears internal data for shutdown process.
   void PrepareForShutdown();
 
   // Returns whether the shelf and its contents (launcher, status) are visible
   // on the screen.
   bool IsVisible() const;
 
   // Returns the ideal bounds of the shelf assuming it is visible.
   gfx::Rect GetIdealBounds();
@@ skipping 132 matching lines @@
 
     ShelfVisibilityState visibility_state;
     ShelfAutoHideState auto_hide_state;
     WorkspaceWindowState window_state;
     bool is_screen_locked;
   };
 
   // Sets the visibility of the shelf to |state|.
   void SetState(ShelfVisibilityState visibility_state);
 
+  // Updates the bounds and opacity of the launcher and status widgets.
+  // If |observer| is specified, it will be called back when the animations, if
+  // any, are complete.
+  void UpdateBoundsAndOpacity(const TargetBounds& target_bounds,
+                              bool animate,
+                              ui::ImplicitAnimationObserver* observer);
+
   // Stops any animations and progresses them to the end.
   void StopAnimating();
 
   // Returns the width (if aligned to the side) or height (if aligned to the
   // bottom).
   void GetShelfSize(int* width, int* height);
 
   // Insets |bounds| by |inset| on the edge the shelf is aligned to.
   void AdjustBoundsBasedOnAlignment(int inset, gfx::Rect* bounds) const;
 
@@ skipping 48 matching lines @@
   virtual void OnDockBoundsChanging(const gfx::Rect& dock_bounds) OVERRIDE;
 
   // Generates insets for inward edge based on the current shelf alignment.
   gfx::Insets GetInsetsForAlignment(int distance) const;
 
   // The RootWindow is cached so that we don't invoke Shell::GetInstance() from
   // our destructor. We avoid that as at the time we're deleted Shell is being
   // deleted too.
   aura::RootWindow* root_window_;
 
-  // True when inside LayoutShelf method. Used to prevent calling LayoutShelf
-  // again from SetChildBounds().
-  bool in_layout_;
+  // True when inside UpdateBoundsAndOpacity() method. Used to prevent calling
+  // UpdateBoundsAndOpacity() from SetChildBounds().
+  bool updating_bounds_;
 
   // See description above setter.
   ShelfAutoHideBehavior auto_hide_behavior_;
 
   ShelfAlignment alignment_;
 
   // Current state.
   State state_;
 
   ShelfWidget* shelf_;
@@ skipping 18 matching lines @@
 
   ObserverList<ShelfLayoutManagerObserver> observers_;
 
   // The shelf reacts to gesture-drags, and can be set to auto-hide for certain
   // gestures. Some shelf behaviour (e.g. visibility state, background color
   // etc.) are affected by various stages of the drag. The enum keeps track of
   // the present status of the gesture drag.
   enum GestureDragStatus {
     GESTURE_DRAG_NONE,
     GESTURE_DRAG_IN_PROGRESS,
+    GESTURE_DRAG_CANCEL_IN_PROGRESS,
     GESTURE_DRAG_COMPLETE_IN_PROGRESS
   };
   GestureDragStatus gesture_drag_status_;
 
   // Tracks the amount of the drag. The value is only valid when
   // |gesture_drag_status_| is set to GESTURE_DRAG_IN_PROGRESS.
   float gesture_drag_amount_;
 
   // Manage the auto-hide state during the gesture.
   ShelfAutoHideState gesture_drag_auto_hide_state_;
 
   // Used to delay updating shelf background.
   UpdateShelfObserver* update_shelf_observer_;
 
   // The bounds of the keyboard.
   gfx::Rect keyboard_bounds_;
 
   // The bounds of the dock.
   gfx::Rect dock_bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_