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

Unified Diff: ash/aura/wm_root_window_controller_aura.h

Issue 2335963002: Refactor: remove SetDisplayWorkAreaInsets calls. (Closed)
Patch Set: Created 4 years, 3 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 | « no previous file | ash/aura/wm_root_window_controller_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_root_window_controller_aura.h
diff --git a/ash/aura/wm_root_window_controller_aura.h b/ash/aura/wm_root_window_controller_aura.h
index 6c82986348b01eda679e5aaec94b608f15c3b8ed..680f2793d95997d441a7cf22324712a79fe84355 100644
--- a/ash/aura/wm_root_window_controller_aura.h
+++ b/ash/aura/wm_root_window_controller_aura.h
@@ -10,6 +10,7 @@
#include "ash/common/wm_root_window_controller.h"
#include "base/macros.h"
#include "base/observer_list.h"
+#include "ui/display/display_observer.h"
namespace aura {
class Window;
@@ -20,7 +21,8 @@ namespace ash {
class RootWindowController;
class ASH_EXPORT WmRootWindowControllerAura : public WmRootWindowController,
- public ShellObserver {
+ public ShellObserver,
+ public display::DisplayObserver {
public:
explicit WmRootWindowControllerAura(
RootWindowController* root_window_controller);
@@ -51,11 +53,16 @@ class ASH_EXPORT WmRootWindowControllerAura : public WmRootWindowController,
void RemoveObserver(WmRootWindowControllerObserver* observer) override;
// ShellObserver:
- void OnDisplayWorkAreaInsetsChanged() override;
void OnFullscreenStateChanged(bool is_fullscreen,
WmWindow* root_window) override;
void OnShelfAlignmentChanged(WmWindow* root_window) override;
+ // DisplayObserver:
+ void OnDisplayAdded(const display::Display& display) override;
+ void OnDisplayRemoved(const display::Display& display) override;
+ void OnDisplayMetricsChanged(const display::Display& display,
+ uint32_t metrics) override;
+
private:
RootWindowController* root_window_controller_;
base::ObserverList<WmRootWindowControllerObserver> observers_;
« no previous file with comments | « no previous file | ash/aura/wm_root_window_controller_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698