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

Unified Diff: ash/common/shelf/shelf_layout_manager.h

Issue 2700523004: Remove docked windows entirely in M59. (Closed)
Patch Set: Rebase Created 3 years, 10 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/common/shelf/shelf_layout_manager.h
diff --git a/ash/common/shelf/shelf_layout_manager.h b/ash/common/shelf/shelf_layout_manager.h
index 87f598a8bd6267c271b5aa9a1230e5e023772d4b..b7e29ee5b57f763d4fdd60953710e2b7be5886a5 100644
--- a/ash/common/shelf/shelf_layout_manager.h
+++ b/ash/common/shelf/shelf_layout_manager.h
@@ -11,7 +11,6 @@
#include "ash/common/session/session_state_observer.h"
#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/shell_observer.h"
-#include "ash/common/wm/dock/docked_window_layout_manager_observer.h"
#include "ash/common/wm/lock_state_observer.h"
#include "ash/common/wm/wm_snap_to_pixel_layout_manager.h"
#include "ash/common/wm/workspace/workspace_types.h"
@@ -48,7 +47,6 @@ class WmShelf;
class ASH_EXPORT ShelfLayoutManager
: public ShellObserver,
public WmActivationObserver,
- public DockedWindowLayoutManagerObserver,
public keyboard::KeyboardControllerObserver,
public LockStateObserver,
public wm::WmSnapToPixelLayoutManager,
@@ -72,9 +70,6 @@ class ASH_EXPORT ShelfLayoutManager
// Returns the preferred size of the shelf for the target visibility state.
gfx::Size GetPreferredSize();
- // Returns the docked area bounds.
- const gfx::Rect& dock_bounds() const { return dock_bounds_; }
-
// Returns the bounds within the root window not occupied by the shelf nor the
// virtual keyboard.
const gfx::Rect& user_work_area_bounds() const {
@@ -267,11 +262,6 @@ class ASH_EXPORT ShelfLayoutManager
int GetWorkAreaInsets(const State& state, int size) const;
- // Overridden from DockedWindowLayoutManagerObserver:
- void OnDockBoundsChanging(
- const gfx::Rect& dock_bounds,
- DockedWindowLayoutManagerObserver::Reason reason) override;
-
// Called when the LoginUI changes from visible to invisible.
void UpdateShelfVisibilityAfterLoginUIChange();
@@ -339,9 +329,6 @@ class ASH_EXPORT ShelfLayoutManager
// The bounds of the keyboard.
gfx::Rect keyboard_bounds_;
- // The bounds of the dock.
- gfx::Rect dock_bounds_;
-
// The bounds within the root window not occupied by the shelf nor the virtual
// keyboard.
gfx::Rect user_work_area_bounds_;

Powered by Google App Engine
This is Rietveld 408576698