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

Unified Diff: ash/mus/root_window_controller.h

Issue 2259153002: mash: Port ash_sysui ShelfDelegateMus impl to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. 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/mus/DEPS ('k') | ash/mus/root_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « ash/mus/DEPS ('k') | ash/mus/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698