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

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

Issue 1911833002: Converts DockedWindowLayoutManager to use WmRootWindowControllerObserver (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 2 trunk 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/ash.gyp ('k') | ash/wm/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/wm/aura/wm_root_window_controller_aura.h
diff --git a/ash/wm/aura/wm_root_window_controller_aura.h b/ash/wm/aura/wm_root_window_controller_aura.h
index 3896b61ff6b2beca32b42f80287dd400acf25696..b3216f1529d94b7ef8f6d839101eae496f21536b 100644
--- a/ash/wm/aura/wm_root_window_controller_aura.h
+++ b/ash/wm/aura/wm_root_window_controller_aura.h
@@ -6,8 +6,10 @@
#define ASH_WM_AURA_WM_ROOT_CONTROLLER_AURA_H_
#include "ash/ash_export.h"
+#include "ash/shell_observer.h"
#include "ash/wm/common/wm_root_window_controller.h"
#include "base/macros.h"
+#include "base/observer_list.h"
namespace aura {
class Window;
@@ -19,7 +21,8 @@ class RootWindowController;
namespace wm {
-class ASH_EXPORT WmRootWindowControllerAura : public WmRootWindowController {
+class ASH_EXPORT WmRootWindowControllerAura : public WmRootWindowController,
+ public ShellObserver {
public:
explicit WmRootWindowControllerAura(
RootWindowController* root_window_controller);
@@ -40,9 +43,18 @@ class ASH_EXPORT WmRootWindowControllerAura : public WmRootWindowController {
views::Widget* widget,
int shell_container_id,
views::Widget::InitParams* init_params) override;
+ void AddObserver(WmRootWindowControllerObserver* observer) override;
+ void RemoveObserver(WmRootWindowControllerObserver* observer) override;
+
+ // ShellObserver:
+ void OnDisplayWorkAreaInsetsChanged() override;
+ void OnFullscreenStateChanged(bool is_fullscreen,
+ aura::Window* root_window) override;
+ void OnShelfAlignmentChanged(aura::Window* root_window) override;
private:
RootWindowController* root_window_controller_;
+ base::ObserverList<WmRootWindowControllerObserver> observers_;
DISALLOW_COPY_AND_ASSIGN(WmRootWindowControllerAura);
};
« no previous file with comments | « ash/ash.gyp ('k') | ash/wm/aura/wm_root_window_controller_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698