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

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

Issue 2843193002: chromeos: fix focus for mushrome (Closed)
Patch Set: feedback Created 3 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 | « ui/aura/mus/focus_synchronizer.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 238aece75cc7153da3f2baa2d43372b15d990591..57616e9ffde0f540d0d3195865d1e76adc6dabca 100644
--- a/ui/aura/mus/window_tree_client.h
+++ b/ui/aura/mus/window_tree_client.h
@@ -581,6 +581,11 @@ class AURA_EXPORT WindowTreeClient
std::unique_ptr<mojo::AssociatedBinding<ui::mojom::WindowManager>>
window_manager_internal_;
ui::mojom::WindowManagerClientAssociatedPtr window_manager_internal_client_;
+ // Normally the same as |window_manager_internal_client_|. Tests typically
+ // run without a service_manager::Connector, which means this (and
+ // |window_manager_internal_client_|) are null. Tests that need to test
+ // WindowManagerClient set this, but not |window_manager_internal_client_|.
+ ui::mojom::WindowManagerClient* window_manager_client_ = nullptr;
bool has_pointer_watcher_ = false;
« no previous file with comments | « ui/aura/mus/focus_synchronizer.cc ('k') | ui/aura/mus/window_tree_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698