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

Unified Diff: ash/shelf/shelf_layout_manager.h

Issue 2093283002: mash: Convert all of //ash/system to use WmShelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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
« no previous file with comments | « ash/mus/bridge/wm_shelf_mus.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_layout_manager.h
diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
index 1e7eea62b2db6c35820d942070b0d136ba49c8b9..127fff861adcb0c1762a018283b6176f5e2bffc4 100644
--- a/ash/shelf/shelf_layout_manager.h
+++ b/ash/shelf/shelf_layout_manager.h
@@ -162,6 +162,9 @@ class ASH_EXPORT ShelfLayoutManager
aura::Window* gained_active,
aura::Window* lost_active) override;
+ // Overridden from keyboard::KeyboardControllerObserver:
+ void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override;
+
// Overridden from ash::LockStateObserver:
void OnLockStateEvent(LockStateObserver::EventType event) override;
@@ -301,9 +304,6 @@ class ASH_EXPORT ShelfLayoutManager
int GetWorkAreaInsets(const State& state, int size) const;
- // Overridden from keyboard::KeyboardControllerObserver:
- void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override;
-
// Overridden from DockedWindowLayoutManagerObserver:
void OnDockBoundsChanging(
const gfx::Rect& dock_bounds,
« no previous file with comments | « ash/mus/bridge/wm_shelf_mus.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698