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

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

Issue 2295003002: mash: Remove WmRootWindowControllerObserver. (Closed)
Patch Set: Address comments. Created 4 years, 4 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/aura/wm_root_window_controller_aura.cc ('k') | ash/common/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 aae684e4ae8afb06a40d8ce462abf91b66fdc847..b16b13df676cf483b3b61d2a4affcd4285f3ea9e 100644
--- a/ash/common/shelf/shelf_layout_manager.h
+++ b/ash/common/shelf/shelf_layout_manager.h
@@ -186,7 +186,6 @@ class ASH_EXPORT ShelfLayoutManager
void SetChromeVoxPanelHeight(int height);
private:
- class RootWindowControllerObserverImpl;
class UpdateShelfObserver;
friend class PanelLayoutManagerTest;
friend class ShelfLayoutManagerTest;
@@ -372,9 +371,6 @@ class ASH_EXPORT ShelfLayoutManager
// TODO(oshima): Remove this when MD immersive is launched.
bool invisible_auto_hide_shelf_ = false;
- std::unique_ptr<RootWindowControllerObserverImpl>
- root_window_controller_observer_;
-
DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
};
« no previous file with comments | « ash/aura/wm_root_window_controller_aura.cc ('k') | ash/common/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698