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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/mus/bridge/wm_shell_mus.h

Issue 2203003003: Get AcceleratorControllerTest working with mash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 4 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
« ash/mus/accelerators/accelerator_controller_unittest.cc ('K') | « ash/mus/bridge/wm_root_window_controller_mus.cc ('k') | ash/mus/bridge/wm_shell_mus_test_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_shell_mus.h
diff --git a/ash/mus/bridge/wm_shell_mus.h b/ash/mus/bridge/wm_shell_mus.h
index 4185b61d30dc09e841402beffbe5bbf881f695f1..ea072775a680cdbdb4fa8edd233c40a79a08708f 100644
--- a/ash/mus/bridge/wm_shell_mus.h
+++ b/ash/mus/bridge/wm_shell_mus.h
@@ -30,6 +30,7 @@ class AcceleratorControllerDelegateMus;
class AcceleratorControllerRegistrar;
class WindowManager;
class WmRootWindowControllerMus;
+class WmShellMusTestApi;
class WmWindowMus;
// WmShell implementation for mus.
@@ -97,6 +98,8 @@ class WmShellMus : public WmShell, public ui::WindowTreeClientObserver {
#endif
private:
+ friend class WmShellMusTestApi;
+
ui::WindowTreeClient* window_tree_client();
// Returns true if |window| is a window that can have active children.
« ash/mus/accelerators/accelerator_controller_unittest.cc ('K') | « ash/mus/bridge/wm_root_window_controller_mus.cc ('k') | ash/mus/bridge/wm_shell_mus_test_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698