Index: ash/mus/root_window_controller.h |
diff --git a/ash/mus/root_window_controller.h b/ash/mus/root_window_controller.h |
index 2a66275885815ffab031f02112a1ceeea64f4f32..48642f0dbb527c5da12948090f583755607ba462 100644 |
--- a/ash/mus/root_window_controller.h |
+++ b/ash/mus/root_window_controller.h |
@@ -8,7 +8,6 @@ |
#include <memory> |
#include "ash/mus/disconnected_app_handler.h" |
-#include "ash/mus/shelf_layout_manager_delegate.h" |
#include "ash/public/interfaces/container.mojom.h" |
#include "services/ui/public/cpp/window_observer.h" |
#include "services/ui/public/interfaces/window_manager_constants.mojom.h" |
@@ -38,12 +37,12 @@ class WmWindowMus; |
// RootWindowController is tied to the lifetime of the ui::Window it is |
// created with. It is assumed the RootWindowController is deleted once the |
// associated ui::Window is destroyed. |
-class RootWindowController : public ShelfLayoutManagerDelegate { |
+class RootWindowController { |
public: |
RootWindowController(WindowManager* window_manager, |
ui::Window* root, |
const display::Display& display); |
- ~RootWindowController() override; |
+ ~RootWindowController(); |
shell::Connector* GetConnector(); |
@@ -77,9 +76,6 @@ class RootWindowController : public ShelfLayoutManagerDelegate { |
gfx::Rect CalculateDefaultBounds(ui::Window* window) const; |
gfx::Rect GetMaximizedWindowBounds() const; |
- // ShelfLayoutManagerDelegate: |
- void OnShelfWindowAvailable() override; |
- |
// Creates the necessary set of layout managers in the shell windows. |
void CreateLayoutManagers(); |