Snap widgets to pixel boundary on ash

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"
 #include "ash/session/session_state_observer.h"
 #include "ash/shelf/background_animator.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell_observer.h"
+#include "ash/snap_to_pixel_layout_manager.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/wm/dock/docked_window_layout_manager_observer.h"
 #include "ash/wm/lock_state_observer.h"
 #include "ash/wm/workspace/workspace_types.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/observer_list.h"
 #include "base/timer/timer.h"
-#include "ui/aura/layout_manager.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/rect.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_controller_observer.h"
 #include "ui/wm/public/activation_change_observer.h"
 
 namespace aura {
 class RootWindow;
 }
 
@@ skipping 13 matching lines @@
 class WorkspaceController;
 FORWARD_DECLARE_TEST(AshPopupAlignmentDelegateTest, AutoHide);
 FORWARD_DECLARE_TEST(WebNotificationTrayTest, PopupAndFullscreen);
 
 // ShelfLayoutManager is the layout manager responsible for the shelf and
 // status widgets. The shelf is given the total available width and told the
 // width of the status area. This allows the shelf to draw the background and
 // layout to the status area.
 // To respond to bounds changes in the status area StatusAreaLayoutManager works
 // closely with ShelfLayoutManager.
-class ASH_EXPORT ShelfLayoutManager :
-    public aura::LayoutManager,
-    public ash::ShellObserver,
-    public aura::client::ActivationChangeObserver,
-    public DockedWindowLayoutManagerObserver,
-    public keyboard::KeyboardControllerObserver,
-    public LockStateObserver,
-    public SessionStateObserver {
+class ASH_EXPORT ShelfLayoutManager
+    : public ash::ShellObserver,
+      public aura::client::ActivationChangeObserver,
+      public DockedWindowLayoutManagerObserver,
+      public keyboard::KeyboardControllerObserver,
+      public LockStateObserver,
+      public SnapToPixelLayoutManager,
+      public SessionStateObserver {
  public:
 
   // We reserve a small area on the edge of the workspace area to ensure that
   // the resize handle at the edge of the window can be hit.
   static const int kWorkspaceAreaVisibleInset;
 
   // When autohidden we extend the touch hit target onto the screen so that the
   // user can drag the shelf out.
   static const int kWorkspaceAreaAutoHideInset;
 
@@ skipping 80 matching lines @@
   // Returns DRAG_TRAY if the gesture can start dragging the tray-bubble from
   // this point on.
   DragState UpdateGestureDrag(const ui::GestureEvent& gesture);
   void CompleteGestureDrag(const ui::GestureEvent& gesture);
   void CancelGestureDrag();
 
   // Set an animation duration override for the show / hide animation of the
   // shelf. Specifying 0 leads to use the default.
   void SetAnimationDurationOverride(int duration_override_in_ms);
 
-  // Overridden from aura::LayoutManager:
+  // Overridden from SnapLayoutManager:
   virtual void OnWindowResized() OVERRIDE;
-  virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE;
-  virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE;
-  virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE;
-  virtual void OnChildWindowVisibilityChanged(aura::Window* child,
-                                              bool visible) OVERRIDE;
   virtual void SetChildBounds(aura::Window* child,
                               const gfx::Rect& requested_bounds) OVERRIDE;
 
   // Overridden from ash::ShellObserver:
   virtual void OnLockStateChanged(bool locked) OVERRIDE;
   virtual void OnMaximizeModeStarted() OVERRIDE;
 
   // Overriden from aura::client::ActivationChangeObserver:
   virtual void OnWindowActivated(aura::Window* gained_active,
                                  aura::Window* lost_active) OVERRIDE;
@@ skipping 216 matching lines @@
 
   // The show hide animation duration override or 0 for default.
   int duration_override_in_ms_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_