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

Unified Diff: ash/common/wm/workspace/workspace_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
Index: ash/common/wm/workspace/workspace_layout_manager.h
diff --git a/ash/common/wm/workspace/workspace_layout_manager.h b/ash/common/wm/workspace/workspace_layout_manager.h
index e11a782ff8c59d526b3a6a4a449918d3f6b9e466..1a454c2625f2cac4e1dbcc079162421083532a49 100644
--- a/ash/common/wm/workspace/workspace_layout_manager.h
+++ b/ash/common/wm/workspace/workspace_layout_manager.h
@@ -14,9 +14,9 @@
#include "ash/common/wm/wm_types.h"
#include "ash/common/wm_activation_observer.h"
#include "ash/common/wm_layout_manager.h"
-#include "ash/common/wm_root_window_controller_observer.h"
#include "ash/common/wm_window_observer.h"
#include "base/macros.h"
+#include "ui/display/display_observer.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/keyboard/keyboard_controller_observer.h"
@@ -35,7 +35,7 @@ class ASH_EXPORT WorkspaceLayoutManager
public WmWindowObserver,
public WmActivationObserver,
public keyboard::KeyboardControllerObserver,
- public WmRootWindowControllerObserver,
+ public display::DisplayObserver,
public ShellObserver,
public wm::WindowStateObserver {
public:
@@ -58,9 +58,6 @@ class ASH_EXPORT WorkspaceLayoutManager
void SetChildBounds(WmWindow* child,
const gfx::Rect& requested_bounds) override;
- // WmRootWindowControllerObserver overrides:
- void OnWorkAreaChanged() override;
-
// Overriden from WmWindowObserver:
void OnWindowTreeChanged(
WmWindow* window,
@@ -84,6 +81,10 @@ class ASH_EXPORT WorkspaceLayoutManager
void OnPostWindowStateTypeChange(wm::WindowState* window_state,
wm::WindowStateType old_type) override;
+ // display::DisplayObserver overrides:
+ void OnDisplayMetricsChanged(const display::Display& display,
+ uint32_t changed_metrics) override;
+
// ShellObserver overrides:
void OnFullscreenStateChanged(bool is_fullscreen,
WmWindow* root_window) override;
« no previous file with comments | « ash/common/wm/dock/docked_window_layout_manager.cc ('k') | ash/common/wm/workspace/workspace_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698