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

Unified Diff: ash/wm/aura/wm_globals_aura.h

Issue 1918883002: Makes Panel related classes use ash/wm/common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@phantom_window_controller
Patch Set: feedback Created 4 years, 8 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/root_window_controller.cc ('k') | ash/wm/aura/wm_globals_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/aura/wm_globals_aura.h
diff --git a/ash/wm/aura/wm_globals_aura.h b/ash/wm/aura/wm_globals_aura.h
index 46bb1934e703373da4a71c9074e12efa1e7ec71d..1bbf14069ed8bb5dde83d81bf35d60d95b2a01a0 100644
--- a/ash/wm/aura/wm_globals_aura.h
+++ b/ash/wm/aura/wm_globals_aura.h
@@ -8,6 +8,8 @@
#include <set>
#include "ash/ash_export.h"
+#include "ash/display/window_tree_host_manager.h"
+#include "ash/shell_observer.h"
#include "ash/wm/common/wm_globals.h"
#include "base/macros.h"
#include "base/observer_list.h"
@@ -17,7 +19,9 @@ namespace ash {
namespace wm {
class ASH_EXPORT WmGlobalsAura : public WmGlobals,
- public aura::client::ActivationChangeObserver {
+ public aura::client::ActivationChangeObserver,
+ public WindowTreeHostManager::Observer,
+ public ShellObserver {
public:
WmGlobalsAura();
~WmGlobalsAura() override;
@@ -37,6 +41,10 @@ class ASH_EXPORT WmGlobalsAura : public WmGlobals,
UserMetricsRecorder* GetUserMetricsRecorder() override;
void AddActivationObserver(WmActivationObserver* observer) override;
void RemoveActivationObserver(WmActivationObserver* observer) override;
+ void AddDisplayObserver(WmDisplayObserver* observer) override;
+ void RemoveDisplayObserver(WmDisplayObserver* observer) override;
+ void AddOverviewModeObserver(WmOverviewModeObserver* observer) override;
+ void RemoveOverviewModeObserver(WmOverviewModeObserver* observer) override;
private:
// aura::client::ActivationChangeObserver:
@@ -44,9 +52,20 @@ class ASH_EXPORT WmGlobalsAura : public WmGlobals,
aura::Window* gained_active,
aura::Window* lost_active) override;
+ // WindowTreeHostManager::Observer:
+ void OnDisplayConfigurationChanged() override;
+
+ // ShellObserver:
+ void OnOverviewModeEnded() override;
+
bool added_activation_observer_ = false;
base::ObserverList<WmActivationObserver> activation_observers_;
+ bool added_display_observer_ = false;
+ base::ObserverList<WmDisplayObserver> display_observers_;
+
+ base::ObserverList<WmOverviewModeObserver> overview_mode_observers_;
+
DISALLOW_COPY_AND_ASSIGN(WmGlobalsAura);
};
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/wm/aura/wm_globals_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698