Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2248)

Unified Diff: ash/shelf/shelf_layout_manager.h

Issue 13896026: Stick windows to sides of workspaces (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Dock on left or right edge Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/shelf/shelf_layout_manager.h
diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
index e2018f8eaa181fd9f452a39f03aa242b07b1bb37..bc32fa899993e0d3f5e45cbbe29d490dbca0a4e6 100644
--- a/ash/shelf/shelf_layout_manager.h
+++ b/ash/shelf/shelf_layout_manager.h
@@ -11,6 +11,7 @@
#include "ash/shelf/shelf_types.h"
#include "ash/shell_observer.h"
#include "ash/system/status_area_widget.h"
+#include "ash/wm/dock/dock_observer.h"
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/logging.h"
@@ -52,6 +53,7 @@ class ASH_EXPORT ShelfLayoutManager :
public aura::LayoutManager,
public ash::ShellObserver,
public aura::client::ActivationChangeObserver,
+ public DockObserver,
public keyboard::KeyboardControllerObserver {
public:
@@ -281,6 +283,9 @@ class ASH_EXPORT ShelfLayoutManager :
virtual void OnKeyboardBoundsChanging(
const gfx::Rect& keyboard_bounds) OVERRIDE;
+ // Overridden from dock::DockObserver:
+ 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;
@@ -340,6 +345,9 @@ class ASH_EXPORT ShelfLayoutManager :
// The bounds of the keyboard.
gfx::Rect keyboard_bounds_;
+ // The bounds of the dock.
+ gfx::Rect dock_bounds_;
+
DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
};

Powered by Google App Engine
This is Rietveld 408576698