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

Unified Diff: ui/views/mus/desktop_window_tree_host_mus.h

Issue 2655513002: mash: Relay some Chrome aura window properties to Ash. (Closed)
Patch Set: More cleanup. Created 3 years, 11 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: ui/views/mus/desktop_window_tree_host_mus.h
diff --git a/ui/views/mus/desktop_window_tree_host_mus.h b/ui/views/mus/desktop_window_tree_host_mus.h
index 85ccf6996863dc9625191fdcf5e0695cfc15c45b..5c4e7940977f809042a29bab31e10fecb99a81ec 100644
--- a/ui/views/mus/desktop_window_tree_host_mus.h
+++ b/ui/views/mus/desktop_window_tree_host_mus.h
@@ -11,6 +11,7 @@
#include "base/macros.h"
#include "ui/aura/env_observer.h"
#include "ui/aura/mus/window_tree_host_mus.h"
+#include "ui/aura/window_observer.h"
#include "ui/views/mus/mus_client_observer.h"
#include "ui/views/mus/mus_export.h"
#include "ui/views/widget/desktop_aura/desktop_window_tree_host.h"
@@ -27,6 +28,7 @@ class VIEWS_MUS_EXPORT DesktopWindowTreeHostMus
: public DesktopWindowTreeHost,
public MusClientObserver,
public WidgetObserver,
+ public aura::WindowObserver,
public aura::WindowTreeHostMus,
public aura::EnvObserver {
public:
@@ -125,11 +127,17 @@ class VIEWS_MUS_EXPORT DesktopWindowTreeHostMus
// MusClientObserver:
void OnWindowManagerFrameValuesChanged() override;
+ void OnWindowPropertyChanged(aura::Window* window, const void* key) override;
// WidgetObserver:
void OnWidgetActivationChanged(Widget* widget, bool active) override;
- // WindowTreeHostMus:
+ // aura::WindowObserver:
+ void OnWindowPropertyChanged(aura::Window* window,
+ const void* key,
+ intptr_t old) override;
+
+ // aura::WindowTreeHostMus:
void ShowImpl() override;
void HideImpl() override;
void SetBoundsInPixels(const gfx::Rect& bounds_in_pixels) override;

Powered by Google App Engine
This is Rietveld 408576698