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

Unified Diff: ui/aura/mus/window_tree_client.h

Issue 2456843004: Wires up transient windows for aura-mus (Closed)
Patch Set: relative to master Created 4 years, 2 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 | « ui/aura/mus/window_port_mus.cc ('k') | ui/aura/mus/window_tree_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/mus/window_tree_client.h
diff --git a/ui/aura/mus/window_tree_client.h b/ui/aura/mus/window_tree_client.h
index 8c77d24d0cc80119362fc6449d1791eaa95564c2..470354b9c242a729ca813feb0671fc9c374b122a 100644
--- a/ui/aura/mus/window_tree_client.h
+++ b/ui/aura/mus/window_tree_client.h
@@ -24,6 +24,7 @@
#include "ui/aura/aura_export.h"
#include "ui/aura/client/capture_client_observer.h"
#include "ui/aura/client/focus_change_observer.h"
+#include "ui/aura/client/transient_window_client_observer.h"
#include "ui/aura/mus/mus_types.h"
#include "ui/aura/mus/window_manager_delegate.h"
#include "ui/aura/mus/window_tree_host_mus_delegate.h"
@@ -74,9 +75,10 @@ class AURA_EXPORT WindowTreeClient
: NON_EXPORTED_BASE(public ui::mojom::WindowTreeClient),
NON_EXPORTED_BASE(public ui::mojom::WindowManager),
public WindowManagerClient,
+ public WindowTreeHostMusDelegate,
public client::CaptureClientObserver,
public client::FocusChangeObserver,
- public WindowTreeHostMusDelegate {
+ public client::TransientWindowClientObserver {
public:
explicit WindowTreeClient(
WindowTreeClientDelegate* delegate,
@@ -445,6 +447,12 @@ class AURA_EXPORT WindowTreeClient
// Overriden from WindowTreeHostMusDelegate:
void SetRootWindowBounds(Window* window, gfx::Rect* bounds) override;
+ // Override from client::TransientWindowClientObserver:
+ void OnTransientChildWindowAdded(Window* parent,
+ Window* transient_child) override;
+ void OnTransientChildWindowRemoved(Window* parent,
+ Window* transient_child) override;
+
// The one int in |cursor_location_mapping_|. When we read from this
// location, we must always read from it atomically.
base::subtle::Atomic32* cursor_location_memory() {
« no previous file with comments | « ui/aura/mus/window_port_mus.cc ('k') | ui/aura/mus/window_tree_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698